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

Timestamp:

Jun 8, 2006, 4:50:50 PM (18 years ago)

Author:

bensch

Message:

merge

Location:

trunk/src/story_entities

Files:

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

trunk/src/story_entities/game_world.cc

@@ -139 +139 @@
 }
 
-
+#include "account.cc"
+#include "object.cc"
 /**
  *  loads the GameWorld by initializing all resources, and set their default values.
@@ -181 +182 @@
   this->dataXML = (TiXmlElement*)root->Clone();
 
+
+  Object* obj= new Object();
+  obj->setName("Obj");
+  Account* a = new Account();
+  a->setName("a");
+  Account *b = new Account(30);
+  b->setName("b");
+  
+  LoadParamXML(root, "ScriptManager", &this->scriptManager, ScriptManager, loadParams);
+
   delete XMLDoc;
   this->releaseLoadScreen();
@@ -191 +202 @@
 ErrorMessage GameWorld::unloadData()
 {
+
   PRINTF(3)("GameWorld::~GameWorld() - unloading the current GameWorld\n");
+  this->scriptManager.flush();
+
   delete this->shell;
 
@@ -215 +229 @@
   this->bRunning = true;
 
+  State::setScripManager(&this->scriptManager);
+
   this->run();
 }
@@ -225 +241 @@
 {
   PRINTF(3)("GameWorld::stop() - got stop signal\n");
+  State::setScripManager(NULL);
   this->bRunning = false;
 }

trunk/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
@@ -103 +105 @@
     GameRules*          gameRules;                    //!< Pointer to the data structure containig the game rules
 
-
   private:
     /* external modules interfaces */
+    ScriptManager       scriptManager;
     OrxShell::Shell*    shell;
 };