Changeset 8240 in orxonox.OLD

Timestamp:

Jun 8, 2006, 1:56:28 PM (18 years ago)

Author:

bensch

Message:

cleaner

Location:

branches/script_engine/src

Files:

• lib/script_engine/script_manager.h (modified) (1 diff)
• story_entities/game_world.cc (modified) (2 diffs)

branches/script_engine/src/lib/script_engine/script_manager.h

@@ -20 +20 @@
   virtual void loadParams(const TiXmlElement* root);
 
-  /// QUERRYING
+  /// QUERY PROCESS
   Script* getScriptByFile(const std::string& file);
 
-
+  void  flush();                                   //!< Resets the script manager
 
  private:
-   void  flush();                                   //!< Resets the script manager
    void  createScripts(const TiXmlElement* scripts);
    void  createTriggers(const TiXmlElement* triggers);

branches/script_engine/src/story_entities/game_world.cc

@@ -193 +193 @@
 ErrorMessage GameWorld::unloadData()
 {
+
   PRINTF(3)("GameWorld::~GameWorld() - unloading the current GameWorld\n");
+  this->scriptManager.flush();
+
   delete this->shell;
 
@@ -228 +231 @@
 {
   PRINTF(3)("GameWorld::stop() - got stop signal\n");
+  State::setScripManager(NULL);
   this->bRunning = false;
 }