Changeset 8210 in orxonox.OLD

Timestamp:

Jun 7, 2006, 8:29:58 PM (18 years ago)

Author:

snellen

Message:

implemented reset function of the script manager

File:

• branches/script_engine/src/lib/script_engine/script_manager.cc (modified) (6 diffs)

branches/script_engine/src/lib/script_engine/script_manager.cc

@@ -23 +23 @@
 ScriptManager::~ScriptManager()
 {
-
+  // delete all scripts since they are useless without the manager
+  if(getScripts())
+    for(std::list<BaseObject*>::const_iterator it = scripts->begin(); it != scripts->end(); it++ )
+  {
+    ClassList::removeFromClassList( (*it) );
+  }
 
 }
@@ -30 +35 @@
 void ScriptManager::loadParams(const TiXmlElement* root)
 {
+  this->reset();
   //BaseObject::loadParams(root);
   {
-  LoadParamXML(root, "ScriptTriggers", this, ScriptManager, createTriggers); 
-  
+  LoadParamXML(root, "ScriptTriggers", this, ScriptManager, createTriggers);
+
   LoadParamXML(root, "Scripts", this, ScriptManager, createScripts);
   } // make shure that the loading process is finished
-  
+
   // fill the scripts and triggers (doing that on runtime is very slow!)
   getTriggers();
   getScripts();
-  
-  
+
+
 }
 
 void  ScriptManager::reset()
 {
-  //TODO: delete all scripts and triggers, empty lists.
+  //Delete all scripts as they aren't deleted automatically
+  if(getScripts())
+    for(std::list<BaseObject*>::const_iterator it = scripts->begin(); it != scripts->end(); it++ )
+  {
+    ClassList::removeFromClassList( (*it) );
+  }
 
-
-
+  this->scripts = NULL;
+  this->triggers = NULL;
 }
 
@@ -56 +67 @@
   //this->setClassID("");
   this->setName("ScriptManager");
-  
+
   this->scripts = NULL;
   this->triggers = NULL;
@@ -64 +75 @@
 void  ScriptManager::createScripts(const TiXmlElement* scripts)
 {
-  
+
   LOAD_PARAM_START_CYCLE(scripts, object);
   {
@@ -94 +105 @@
      }
    }
-   
+
   return NULL;
 
@@ -102 +113 @@
 bool ScriptManager::getScripts()
 {
-  return (this->scripts != NULL || (this->scripts = ClassList::getList(CL_SCRIPT)) != NULL); 
+  return (this->scripts != NULL || (this->scripts = ClassList::getList(CL_SCRIPT)) != NULL);
 }
 
 bool ScriptManager::getTriggers()
 {
-  return (this->triggers != NULL || (this->triggers = ClassList::getList(CL_SCRIPT_TRIGGER)) != NULL); 
+  return (this->triggers != NULL || (this->triggers = ClassList::getList(CL_SCRIPT_TRIGGER)) != NULL);
 }