Changeset 8211 in orxonox.OLD for branches/script_engine/src/lib/script_engine/script_trigger.cc

Timestamp:

Jun 7, 2006, 8:47:05 PM (18 years ago)

Author:

snellen

Message:

cleaned script trigger, added member: a pointer to the required script

File:

• branches/script_engine/src/lib/script_engine/script_trigger.cc (modified) (7 diffs)

branches/script_engine/src/lib/script_engine/script_trigger.cc

@@ -7 +7 @@
 {
   scriptCalled = false;
-  callScript = false;
-  triggered = false;
+  scriptIsOk = false;
   loadParams(root);
 
@@ -24 +23 @@
   {
   WorldEntity ::loadParams(root);
-  
+
    { LoadParam(root, "file", this, ScriptTrigger, setScript)
         .describe("the fileName of the script, that should be triggered by this script trigger")
@@ -50 +49 @@
     timer = delay;
   }
- 
+
 }
 
@@ -57 +56 @@
 {
   BaseObject* targetEntity = ClassList::getObject(target, CL_WORLD_ENTITY);
-  
+
   if (targetEntity != NULL)
   {
@@ -71 +70 @@
 {
   BaseObject* parentEntity = ClassList::getObject(parent, CL_WORLD_ENTITY);
-  
+
   if (parentEntity != NULL)
   {
@@ -105 +104 @@
 void ScriptTrigger::executeAction()
 {
-     ScriptManager* scriptManager = ScriptManager::getInstance();
-     Script* script = scriptManager->getScriptByFile(this->scriptFile);
-     if(script != NULL)
+     if(scriptIsOk)
      {
      if(!(script->selectFunction(this->functionName,0)) )
@@ -115 +112 @@
      }
 }
+
+
+void ScriptTrigger::setScript(const std::string& file)
+{
+  ScriptManager* scriptManager = ScriptManager::getInstance();
+  script = scriptManager->getScriptByFile(file);
+  if(script != NULL)
+    scriptIsOk = true;
+
+}