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

Timestamp:

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

Author:

bensch

Message:

merged the gui back

File:

• trunk/src/story_entities/multi_player_world_data.cc (modified) (8 diffs)

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();
 }