Changeset 8085 in orxonox.OLD for branches/script_engine/src/lib/script_engine/script.cc

Timestamp:

Jun 1, 2006, 5:07:28 PM (18 years ago)

Author:

snellen

Message:

started implementing script_manager

File:

• branches/script_engine/src/lib/script_engine/script.cc (modified) (4 diffs)

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

@@ -29 +29 @@
 
    if(currentFile.length() != 0)
+   { 
      printf("Could not load %s because an other file is already loaded: %s\n",filename.c_str(), currentFile.c_str());
+     return false;
+    }
 
    int error = luaL_loadfile (luaState, filename.c_str());
@@ -74 +77 @@
  bool Script::selectFunction(std::string& functionName, int retCount)
  {
-   if(returnCount == 0) //no return values left on the stack
+   if(returnCount == 0 && currentFunction.length() == 0) //no return values left on the stack and no other function selected
    {
    lua_pushlstring(luaState, functionName.c_str(), functionName.size() );
@@ -90 +93 @@
    }
    else
-     printf("there are unremoved return values on the stack. Please remove them first.\n");
+     printf("There is an other function active ( %s ) or there are unremoved return values on the stack. Please remove them first.\n",currentFunction.c_str());
+   return false;
  }
 
@@ -214 +218 @@
  int Script::reportError(int error)
  {
- const char *msg = lua_tostring(luaState, -1);
- if (msg == NULL) msg = "(error with no message)";
- fprintf(stderr, "ERROR: %s\n", msg);
- lua_pop(luaState, 1);
- return error;
- }
-
+ if(error != 0)
+ {
+  const char *msg = lua_tostring(luaState, -1);
+  if (msg == NULL) msg = "(error with no message)";
+  fprintf(stderr, "ERROR: %s\n", msg);
+  lua_pop(luaState, 1);
+  return error;
+ }
+ }
+