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

Timestamp:

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

Author:

bensch

Message:

merged the gui back

File:

• trunk/src/story_entities/game_world.cc (modified) (12 diffs)

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