Changeset 9869 in orxonox.OLD for trunk/src/story_entities/menu/game_menu.h

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:

• trunk/src/story_entities/menu/game_menu.h (modified) (4 diffs)

trunk/src/story_entities/menu/game_menu.h

@@ -22 +22 @@
 class GameMenu : virtual public GameWorld, virtual public EventListener
 {
-
+  ObjectListDeclaration(GameMenu);
   public:
     GameMenu(const TiXmlElement* root = NULL);
@@ -45 +45 @@
     void showMultiPlayer();
     void showOptionsMenu();
-    
+
     void showClientMenu();
     void connectToServer();
-    
+
     void showServerMenu();
     void createMasterServer();
@@ -69 +69 @@
     void setSelectorSound(const std::string& selectorSound);
 
-    
+
 
 
@@ -76 +76 @@
     OrxGui::GLGuiBox*                 levelsBox;
     OrxGui::GLGuiBox*                 networkBox;
-    
+
     OrxGui::GLGuiBox*                 clientNetworkBox;
     OrxGui::GLGuiInputLine*           ipInputLine;
-    
+
     OrxGui::GLGuiBox*                 serverNetworkBox;