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

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..

Location:

trunk/src/story_entities/menu

Files:

• game_menu.cc (modified) (4 diffs)
• game_menu.h (modified) (4 diffs)
• glgui_imagebutton.cc (modified) (2 diffs)

trunk/src/story_entities/menu/game_menu.cc

@@ -22 +22 @@
 
 #include "state.h"
-#include "class_list.h"
 
 #include "util/loading/load_param.h"
 #include "util/loading/factory.h"
-#include "util/loading/resource_manager.h"
 
 #include "graphics_engine.h"
@@ -41 +39 @@
 #include "network_manager.h"
 
-#include "preferences.h"
-
+#include "parser/preferences/preferences.h"
+
+#include "class_id_DEPRECATED.h"
 //! This creates a Factory to fabricate a GameMenu
-CREATE_FACTORY(GameMenu, CL_GAME_MENU);
-
+ObjectListDefinitionID(GameMenu, CL_GAME_MENU);
+CREATE_FACTORY(GameMenu);
 
 
@@ -51 +50 @@
     : GameWorld()
 {
-  this->setClassID(CL_GAME_MENU, "GameMenu");
+  this->registerObject(this, GameMenu::_objectList);
   this->setName("GameMenu uninitialized");
 
@@ -191 +190 @@
       image->setForegroundColor(Color( 1,1,1,.6));
 
-      const std::list<BaseObject*>* storyEntities = ClassList::getList(CL_STORY_ENTITY);
-      std::list<BaseObject*>::const_iterator it;
       bool first = true;
-      for( it = storyEntities->begin(); it != storyEntities->end(); it++)
+      for(ObjectList<StoryEntity>::const_iterator it = StoryEntity::objectList().begin();
+          it != StoryEntity::objectList().end();
+          ++it)
       {
-        StoryEntity* se = dynamic_cast<StoryEntity*>(*it);
+        StoryEntity* se = *it;
         if( se->isContainedInMenu())
         {
 
-          printf("%s\n", se->getMenuScreenshoot().c_str());
+          PRINTF(3)("Load image %s\n", se->getMenuScreenshoot().c_str());
           OrxGui::GLGuiImageButton* button = new OrxGui::GLGuiImageButton(se->getName(), se->getStoryID(), se->getMenuScreenshoot(), image);
           button->startLevel.connect(this, &GameMenu::startLevel);

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;
 

trunk/src/story_entities/menu/glgui_imagebutton.cc

@@ -14 +14 @@
 */
 
-#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_SHELL
 
 #include "glgui_imagebutton.h"
@@ -45 +44 @@
   void GLGuiImageButton::receivedFocus()
   {
-    printf("%s:: %s\n", this->label().c_str(), this->imageName.c_str());
+    PRINTF(4)("%s:: %s\n", this->label().c_str(), this->imageName.c_str());
 
     this->image->loadImageFromFile(this->imageName);