Changeset 8717 in orxonox.OLD for trunk/src/story_entities

Timestamp:

Jun 22, 2006, 2:04:28 PM (19 years ago)

Author:

bensch

Message:

merged the gui back

Location:

trunk/src/story_entities

Files:

• Makefile.am (modified) (2 diffs)
• campaign.cc (modified) (5 diffs)
• game_world.cc (modified) (12 diffs)
• game_world_data.cc (modified) (9 diffs)
• menu (copied) (copied from branches/gui/src/story_entities/menu)
• menu/game_menu.cc (copied) (copied from branches/gui/src/story_entities/menu/game_menu.cc) (1 diff)
• menu/game_menu.h (copied) (copied from branches/gui/src/story_entities/menu/game_menu.h)
• menu/glgui_imagebutton.cc (copied) (copied from branches/gui/src/story_entities/menu/glgui_imagebutton.cc)
• menu/glgui_imagebutton.h (copied) (copied from branches/gui/src/story_entities/menu/glgui_imagebutton.h)
• multi_player_world.cc (modified) (1 diff)
• multi_player_world_data.cc (modified) (8 diffs)
• simple_game_menu.cc (modified) (1 diff)
• single_player_world_data.cc (modified) (7 diffs)
• story_entity.h (modified) (1 diff)

trunk/src/story_entities/Makefile.am

@@ -13 +13 @@
                 story_entities/multi_player_world_data.cc \
                 story_entities/movie_loader.cc \
-                story_entities/simple_game_menu.cc
+                story_entities/simple_game_menu.cc \
+                \
+                story_entities/menu/game_menu.cc \
+                story_entities/menu/glgui_imagebutton.cc
 
 StoryEntities_HEADERS_ = \
@@ -27 +30 @@
                 story_entities/multi_player_world_data.h \
                 story_entities/movie_loader.h \
-                story_entities/simple_game_menu.h
+                story_entities/simple_game_menu.h \
+                \
+                story_entities/menu/game_menu.h \
+                story_entities/menu/glgui_imagebutton.h
+

trunk/src/story_entities/campaign.cc

@@ -82 +82 @@
   this->bReturnToMenu = false;
   this->run();
+
+  return true;
 }
 
@@ -90 +92 @@
 bool Campaign::pause()
 {
-  this->bPaused = true;
+  return (this->bPaused = true);
 }
 
@@ -100 +102 @@
 {
   PRINTF(4)("Resuming the current Campaign\n");
-  this->bPaused = false;
+  return (this->bPaused = false);
 }
 
@@ -118 +120 @@
     this->currentEntity->stop();
   }
+
+  return true;
 }
 
@@ -127 +131 @@
 {
   ErrorMessage       errorCode;
-  int                storyID = WORLD_ID_0;
+//  int                storyID = WORLD_ID_0;
 
   for( this->currentEntity = this->campaignData->getFirstLevel(), this->bRunning = true;

trunk/src/story_entities/game_world.cc

@@ -140 +140 @@
   State::setScriptManager(&this->scriptManager);
 
+  return ErrorMessage();
 }
 
@@ -153 +154 @@
 
   PRINTF(3)("> Loading world: '%s'\n", getLoadFile().c_str());
-  TiXmlElement* element;
-  GameLoader* loader = GameLoader::getInstance();
+//  TiXmlElement* element;
+//  GameLoader* loader = GameLoader::getInstance();
 
   if( getLoadFile().empty())
   {
     PRINTF(1)("GameWorld has no path specified for loading\n");
-    return (ErrorMessage){213,"Path not specified","GameWorld::load()"};
+    return (ErrorMessage(213,"Path not specified","GameWorld::load()"));
   }
 
@@ -168 +169 @@
     PRINTF(1)("loading XML File: %s @ %s:l%d:c%d\n", XMLDoc->ErrorDesc(), this->getLoadFile().c_str(), XMLDoc->ErrorRow(), XMLDoc->ErrorCol());
     delete XMLDoc;
-    return (ErrorMessage){213,"XML File parsing error","GameWorld::load()"};
+    return ErrorMessage(213,"XML File parsing error","GameWorld::load()");
   }
   // check basic validity
@@ -178 +179 @@
     PRINTF(1)("Specified XML File is not an orxonox world data file (WorldDataFile element missing)\n");
     delete XMLDoc;
-    return (ErrorMessage){213,"Path not a WorldDataFile","GameWorld::load()"};
+    return ErrorMessage(213,"Path not a WorldDataFile","GameWorld::load()");
   }
   /* the whole loading process for the GameWorld */
@@ -191 +192 @@
   //Account *b = new Account(30);
   //b->setName("b");
+
   
   LoadParamXML(root, "ScriptManager", &this->scriptManager, ScriptManager, loadParams);
@@ -196 +198 @@
   delete XMLDoc;
   this->releaseLoadScreen();
+
+  return ErrorMessage();
 }
 
@@ -220 +224 @@
   if (this->dataXML)
     delete this->dataXML;
+
+  return ErrorMessage();
 }
 
@@ -232 +238 @@
   State::setScriptManager(&this->scriptManager); //make sure we have the right script manager
   this->run();
+
+  return true;
 }
 
@@ -242 +250 @@
   PRINTF(3)("GameWorld::stop() - got stop signal\n");
   State::setScriptManager(NULL);
-  this->bRunning = false;
+  return (this->bRunning = false);
 }
 
@@ -251 +259 @@
 bool GameWorld::pause()
 {
-  this->bPaused = true;
+  return (this->bPaused = true);
 }
 
@@ -260 +268 @@
 bool GameWorld::resume()
 {
-  this->bPaused = false;
+  return(this->bPaused = false);
 }
 
@@ -410 +418 @@
     if( likely(this->dataTank->gameRule != NULL))
       this->dataTank->gameRule->tick(this->dtS);
-      
+
   }
 }

trunk/src/story_entities/game_world_data.cc

@@ -108 +108 @@
 
   GraphicsEngine::getInstance()->displayFPS(true);
+
+  return ErrorMessage();
 }
 
@@ -131 +133 @@
   this->loadWorldEntities(root);
   this->loadScene(root);
+
+  return ErrorMessage();
 }
 
@@ -142 +146 @@
   this->unloadWorldEntities();
   this->unloadScene();
+
+  return ErrorMessage();
 }
 
@@ -166 +172 @@
   }
   this->glmis->draw();
+
+  return ErrorMessage();
 }
 
@@ -175 +183 @@
 {
   delete this->glmis;
+
+  return ErrorMessage();
 }
 
@@ -250 +260 @@
   /* init the pnode tree */
   PNode::getNullParent()->init();
+
+  return ErrorMessage();
 }
 
@@ -312 +324 @@
 
   this->glmis = NULL;
+
+  return ErrorMessage();
 }
 
@@ -337 +351 @@
     this->localCamera->addChild(this->sky);
   OrxSound::SoundEngine::getInstance()->setListener(this->localCamera);
+
+  return ErrorMessage();
 }
 
@@ -357 +373 @@
 
   State::setGameRules(NULL);
+
+  return ErrorMessage();
 }
 

trunk/src/story_entities/menu/game_menu.cc

@@ -178 +178 @@
       image->setWidgetSize( 250, 200);
       image->setAbsCoor2D(400, 150);
+      image->setForegroundColor(Color(1,1,1,.6));
 
       const std::list<BaseObject*>* storyEntities = ClassList::getList(CL_STORY_ENTITY);

trunk/src/story_entities/multi_player_world.cc

@@ -123 +123 @@
 /**
  * cleanup
- * @return 
+ * @return
  */
 ErrorMessage MultiPlayerWorld::unloadData( )
 {
-    
+
   GameWorld::unloadData();
-  
+
   delete NetworkManager::getInstance();
   delete NetworkGameManager::getInstance();
 
+  return ErrorMessage();
 }

trunk/src/story_entities/multi_player_world_data.cc

@@ -78 +78 @@
 {
   /* call underlying function */
-  GameWorldData::init();
+  return GameWorldData::init();
 }
 
@@ -89 +89 @@
 {
   /* call underlying function */
-  GameWorldData::loadGUI(root);
+  return GameWorldData::loadGUI(root);
 }
 
@@ -99 +99 @@
 {
   /* call underlying function */
-  GameWorldData::unloadGUI();
+  return GameWorldData::unloadGUI();
 }
 
@@ -245 +245 @@
   this->drawLists.push_back(OM_GROUP_01);
   this->drawLists.push_back(OM_GROUP_01_PROJ);
-  
+
   State::setPlayer(this->localPlayer);
- 
+
+  return ErrorMessage();
 }
 
@@ -257 +258 @@
 {
   /* call underlying function */
-  GameWorldData::unloadWorldEntities();
+  return GameWorldData::unloadWorldEntities();
 }
 
@@ -269 +270 @@
   /* call underlying function */
   GameWorldData::loadScene(root);
-  
+
   // create server playable
   if ( NetworkManager::getInstance()->isGameServer() )
@@ -276 +277 @@
     State::getPlayer()->setPlayable( PlayerStats::getStats( 0 )->getPlayable() );
   }
+
+  return ErrorMessage();
 }
 
@@ -285 +288 @@
 {
   /* call underlying function */
-  GameWorldData::unloadScene();
+  return GameWorldData::unloadScene();
 }
 

trunk/src/story_entities/simple_game_menu.cc

@@ -131 +131 @@
     headers.push_back("3");
     table->setHeader(headers);
+    table->setEntry(1, 2, "Test");
+    table->setEntry(2, 1, "MultiLine SuperTest to see how it works");
 
 

trunk/src/story_entities/single_player_world_data.cc

@@ -45 +45 @@
 {
   /* call underlying function */
-  GameWorldData::init();
+  return GameWorldData::init();
 }
 
@@ -56 +56 @@
 {
   /* call underlying function */
-  GameWorldData::loadGUI(root);
+  return GameWorldData::loadGUI(root);
 }
 
@@ -66 +66 @@
 {
   /* call underlying function */
-  GameWorldData::unloadGUI();
+  return GameWorldData::unloadGUI();
 }
 
@@ -77 +77 @@
 {
   /* call underlying function */
-  GameWorldData::loadWorldEntities(root);
+  return GameWorldData::loadWorldEntities(root);
 }
 
@@ -87 +87 @@
 {
   /* call underlying function */
-  GameWorldData::unloadWorldEntities();
+  return GameWorldData::unloadWorldEntities();
 }
 
@@ -98 +98 @@
 {
   /* call underlying function */
-  GameWorldData::loadScene(root);
+  return GameWorldData::loadScene(root);
 }
 
@@ -108 +108 @@
 {
   /* call underlying function */
-  GameWorldData::unloadScene();
+  return GameWorldData::unloadScene();
 }
 

trunk/src/story_entities/story_entity.h

@@ -35 +35 @@
   /* initialisation and loading */
   /** initializes a Story Entity to the needed values */
-  virtual ErrorMessage init() {};
+  virtual ErrorMessage init() { return ErrorMessage(); };
   /** called to load the data into the StoryEntity*/
-  virtual ErrorMessage loadData() {};
+  virtual ErrorMessage loadData() { return ErrorMessage(); };
   /** function that unloads the data from the StoryEntity */
-  virtual ErrorMessage unloadData() {};
+  virtual ErrorMessage unloadData() { return ErrorMessage(); };
 
   /* running, stopping and pausing */