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

Timestamp:

Feb 3, 2007, 11:55:06 AM (18 years ago)

Author:

snellen

Message:

script_trigger: execution of script aborts now when something goes wrong

Location:

branches/scriptimprovements/src

Files:

• lib/script_engine/lua_vector.cc (modified) (1 diff)
• world_entities/script_trigger.cc (modified) (1 diff)

branches/scriptimprovements/src/lib/script_engine/lua_vector.cc

@@ -23 +23 @@
                         ->addMethod("getY", Executor0ret<LuaVector, lua_State*,float>(&LuaVector::getY))
                         ->addMethod("getZ", Executor0ret<LuaVector, lua_State*,float>(&LuaVector::getZ))
-                        //->addMethod("dot", Executor1ret<Vector, lua_State*,float, Vector>(&Vector::dot))
+                      //  ->addMethod("dot", Executor1ret<LuaVector, lua_State*,float, LuaVector>(&LuaVector::dot))
                        );
 

branches/scriptimprovements/src/world_entities/script_trigger.cc

@@ -213 +213 @@
        //testScriptingFramework();
     if(!(script->selectFunction(this->functionName,returnCount)) )
+     {
       PRINT(1)("ERROR SCRTIPTTRIGGER : Selection of %s in %s failed.\n",functionName.c_str(), script->getFileName().c_str());
-
-    script->pushParam( timestep, this->functionName);
+      return;
+     }
+
+    if (! (script->pushParam( timestep, this->functionName)) )
+      return;
 
     if( !(script->executeFunction()) )
+     {
       PRINT(1)("ERROR SCRTIPTTRIGGER : Execution of %s in %s failed.\n",functionName.c_str(), script->getFileName().c_str());
-
+      return;
+     }
     scriptFinished = script->getReturnedBool();
   }