Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8719 in orxonox.OLD for trunk/src/story_entities/menu/game_menu.cc


Ignore:
Timestamp:
Jun 22, 2006, 2:13:18 PM (18 years ago)
Author:
bensch
Message:

merged the water branche back. conflicts resolved in favour of the trunk

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/story_entities/menu/game_menu.cc

    r8717 r8719  
    178178      image->setWidgetSize( 250, 200);
    179179      image->setAbsCoor2D(400, 150);
    180       image->setForegroundColor(Color(1,1,1,.6));
     180      image->setForegroundColor(Color( 1,1,1,.6));
    181181
    182182      const std::list<BaseObject*>* storyEntities = ClassList::getList(CL_STORY_ENTITY);
Note: See TracChangeset for help on using the changeset viewer.