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

Timestamp:

Jun 14, 2006, 5:50:18 PM (19 years ago)

Author:

bensch

Message:

trunk: merged the script_engine branche back here
merged with command
svn merge ​https://svn.orxonox.net/orxonox/branches/script_engine . -r8284:HEAD
no conflicts

File:

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

trunk/src/story_entities/game_world.cc

@@ -137 +137 @@
   PhysicsEngine::getInstance();
   CREngine::getInstance();
+
+  State::setScriptManager(&this->scriptManager);
+
 }
 
@@ -146 +149 @@
 ErrorMessage GameWorld::loadData()
 {
-  this->displayLoadScreen();
+  this->displayLoadScreen();  State::setScriptManager(&this->scriptManager);
+
 
   PRINTF(0)("Loading the GameWorld\n");
@@ -182 +186 @@
   this->dataXML = (TiXmlElement*)root->Clone();
 
-
+  //remove this after finished testing !!!!
   Object* obj= new Object();
   obj->setName("Obj");
@@ -190 +194 @@
   b->setName("b");
   
+  
   LoadParamXML(root, "ScriptManager", &this->scriptManager, ScriptManager, loadParams);
 
@@ -228 +233 @@
   this->bPaused = false;
   this->bRunning = true;
-
-  State::setScripManager(&this->scriptManager);
-
+  State::setScriptManager(&this->scriptManager); //make sure we have the right script manager
   this->run();
 }
@@ -241 +244 @@
 {
   PRINTF(3)("GameWorld::stop() - got stop signal\n");
-  State::setScripManager(NULL);
+  State::setScriptManager(NULL);
   this->bRunning = false;
 }
@@ -603 +606 @@
 
   AtmosphericEngine::getInstance()->draw();
-  
+
   if( unlikely( this->showBV))
   {