Changeset 8239 in orxonox.OLD for branches/script_engine/src/story_entities

Timestamp:

Jun 8, 2006, 1:53:06 PM (19 years ago)

Author:

bensch

Message:

more integration into orxonox framework

Location:

branches/script_engine/src/story_entities

Files:

• game_world.cc (modified) (2 diffs)
• game_world.h (modified) (2 diffs)

branches/script_engine/src/story_entities/game_world.cc

@@ -181 +181 @@
   this->dataXML = (TiXmlElement*)root->Clone();
 
+  LoadParamXML(root, "ScriptManager", &this->scriptManager, ScriptManager, loadParams);
+
   delete XMLDoc;
   this->releaseLoadScreen();
@@ -213 +215 @@
   this->bPaused = false;
   this->bRunning = true;
+
+  State::setScripManager(&this->scriptManager);
 
   this->run();

branches/script_engine/src/story_entities/game_world.h

@@ -11 +11 @@
 #include "game_world_data.h"
 #include "playable.h"
+#include "script_manager.h"
 
 namespace OrxShell { class Shell; };
 class WorldEntity;
 class GameRules;
+
 
 /** How many frames time values to keep
@@ -102 +104 @@
     GameRules*          gameRules;                    //!< Pointer to the data structure containig the game rules
 
-
   private:
     /* external modules interfaces */
+    ScriptManager       scriptManager;
     OrxShell::Shell*    shell;
 };