Changeset 10565 in orxonox.OLD for branches/scriptimprovements/src

Timestamp:

Feb 3, 2007, 12:21:51 PM (18 years ago)

Author:

snellen

Message:

script_trigger: added conclsive errormessage in case of abort

Location:

branches/scriptimprovements/src/world_entities

Files:

• script_trigger.cc (modified) (3 diffs)
• script_trigger.h (modified) (1 diff)

branches/scriptimprovements/src/world_entities/script_trigger.cc

@@ -60 +60 @@
   scriptCalled = false;
   scriptIsOk = false;
+  executionStopped = false; // true when something goes wrong and the trigger has to be stopped
   triggerRemains = true;
   addToScript = false;
@@ -209 +210 @@
 void ScriptTrigger::executeAction(float timestep)
 {
+  if(executionStopped && scriptIsOk) // If the script has been loaded correctly but something is wrong with the settings of the trigger
+  {
+   PRINT(1)("ERROR SCRTIPTTRIGGER: Something went wrong while executing %s in %s . Execution stopped! \n", functionName.c_str(), script->getFileName().c_str());
+   return;
+  }
+
   if(scriptIsOk)
   {
@@ -215 +222 @@
      {
       PRINT(1)("ERROR SCRTIPTTRIGGER : Selection of %s in %s failed.\n",functionName.c_str(), script->getFileName().c_str());
+      executionStopped = true; //Since the triggersettings won't change on runtime, it makes no sense to call the function again.
       return;
      }
 
     if (! (script->pushParam( timestep, this->functionName)) )
+     {
+      executionStopped = true; //Since the triggersettings won't change on runtime, it makes no sense to call the function again.
       return;
-
+     }
     if( !(script->executeFunction()) )
      {
       PRINT(1)("ERROR SCRTIPTTRIGGER : Execution of %s in %s failed.\n",functionName.c_str(), script->getFileName().c_str());
+      executionStopped = true; //Since the triggersettings won't change on runtime, it makes no sense to call the function again.
       return;
      }

branches/scriptimprovements/src/world_entities/script_trigger.h

@@ -64 +64 @@
     bool         scriptCalled;
     bool         scriptIsOk;
+    bool         executionStopped;   // true when something goes wrong and the trigger has to be stopped
     bool         scriptFinished;
     int          returnCount;        //TODO: set return count correctly