Changeset 8678 in orxonox.OLD

Timestamp:

Jun 21, 2006, 5:01:17 PM (18 years ago)

Author:

snellen

Message:

fixed segfault when a script isn't loaded correctly

Location:

branches/script_engine/src

Files:

• lib/script_engine/script.cc (modified) (3 diffs)
• world_entities/script_trigger.cc (modified) (1 diff)

branches/script_engine/src/lib/script_engine/script.cc

@@ -3 +3 @@
 #include "luaincl.h"
 
-//#include "file.h"
+#include "filesys/file.h"
+#include "util/loading/resource_manager.h"
 
 #include "loading/load_param.h"
@@ -59 +60 @@
  {
 
+   File scriptFile;
+
    if(currentFile.length() != 0)
    {
@@ -69 +72 @@
    if(error == 0)
    {
+     
      error = lua_pcall(luaState, 0, 0, 0);
 
      if(error == 0)
      {
+       printf("Test from Script::loadFile\n");
       currentFile = filename;
       return true;

branches/script_engine/src/world_entities/script_trigger.cc

@@ -181 +181 @@
      if( !(script->executeFunction()) )
        printf("Error ScriptTrigger: Execution of %s in %s failed.\n",functionName.c_str(), script->getFileName().c_str());
+     
+     actionFinished = script->getReturnedBool();
      }
      
-     actionFinished = script->getReturnedBool();
+     
 }