Changeset 9242 in orxonox.OLD for branches

Timestamp:

Jul 6, 2006, 2:00:32 PM (18 years ago)

Author:

snellen

Message:

debug output von script, scriptmanager, scripttrigger an framework angepasst

Location:

branches/scripting/src

Files:

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

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

@@ -87 +87 @@
    if(currentFile.length() != 0)
    {
-     PRINT(1)("Could not load %s because an other file is already loaded: %s\n",filename.c_str(), currentFile.c_str());
+     PRINT(1)("SCRIPT %s : ERROR: Could not load %s because an other file is already loaded: %s\n",currentFile.c_str(),filename.c_str(), currentFile.c_str());
      return false;
     }
@@ -104 +104 @@
      else
      {
-       PRINT(1)("ERROR while loading file %s: \n",filename.c_str());
+       PRINT(1)("SCRIPT %s : ERROR: while loading file %s: \n",currentFile.c_str(),filename.c_str());
        reportError(error);
      }
@@ -111 +111 @@
    else
    {
-     PRINT(1)("ERROR while loading file %s: \n",filename.c_str());
+     PRINT(1)("SCRIPT %s : ERROR: while loading file %s: \n",currentFile.c_str(),filename.c_str());
      reportError(error);
    }
@@ -150 +150 @@
  bool Script::executeFile()
  {
-   PRINT(2)("WARNING: script.executeFile is not implemented yet");
+   PRINT(2)("WARNING: script.executeFile is not implemented yet\n");
    /*if(currentFile.length() != 0)
    {
@@ -183 +183 @@
    }
    else
-     PRINT(1)("There is an other function active ( %s ) or there are unremoved return values on the stack. Please remove them first.\n",currentFunction.c_str());
+     PRINT(1)("SCRIPT %s : ERROR: There is an other function active ( %s ) or there are unremoved return values on the stack. Please remove them first.\n",currentFile.c_str(),currentFunction.c_str());
    return false;
  }
@@ -195 +195 @@
     if(error != 0)
     {
-      PRINT(1)("ERROR while executing function %s: \n",currentFunction.c_str());
+      PRINT(1)("SCRIPT %s : ERROR: Failed to execute function %s: \n",currentFile.c_str(),currentFunction.c_str());
      reportError(error);
      //clean up
@@ -210 +210 @@
    }
    else
-     PRINT(1)("Error: no function selected.\n");
+     PRINT(1)("SCRIPT %s : ERROR: no function selected.\n",currentFile.c_str());
 
    return false;
@@ -227 +227 @@
    else
    {
-     PRINT(1)("Couldn't add parameter because the wrong function is selected: %s instead of %s\n", currentFunction.c_str(), toFunction.c_str());
+     PRINT(1)("SCRIPT %s : ERROR: Couldn't add parameter because the wrong function is selected: %s instead of %s\n",currentFile.c_str(), currentFunction.c_str(), toFunction.c_str());
     return false;
    }
@@ -244 +244 @@
    else
    {
-     PRINT(1)("Couldn't add parameter because the wrong function is selected: %s instead of %s\n", currentFunction.c_str(), toFunction.c_str());
+     PRINT(1)("SCRIPT %s : ERROR: Couldn't add parameter because the wrong function is selected: %s instead of %s\n",currentFile.c_str(), currentFunction.c_str(), toFunction.c_str());
      return false;
    }
@@ -260 +260 @@
    else
    {
-     PRINT(1)("Couldn't add parameter because the wrong function is selected: %s instead of %s\n", currentFunction.c_str(), toFunction.c_str());
+     PRINT(1)("SCRIPT %s : ERROR: Couldn't add parameter because the wrong function is selected: %s instead of %s\n",currentFile.c_str(), currentFunction.c_str(), toFunction.c_str());
      return false;
    }
@@ -295 +295 @@
      }
      else
-       PRINT(1)("ERROR: Form %s : trying to retreive non bolean value",this->currentFile.c_str());
+       PRINT(1)("SCRIPT %s : ERROR: Trying to retreive non bolean value\n",this->currentFile.c_str());
    }
    return returnValue;
@@ -346 +346 @@
  {
   const char *msg = lua_tostring(luaState, -1);
-  if (msg == NULL) msg = "(error with no message)";
-  fprintf(stderr, "ERROR: %s\n", msg);
+  if (msg == NULL) msg = "(error with no message)\n";
+  PRINT(1)("ERROR: %s\n", msg);
   lua_pop(luaState, 1);
  }

branches/scripting/src/world_entities/script_trigger.cc

@@ -48 +48 @@
  */
 ScriptTrigger::ScriptTrigger(const TiXmlElement* root)
-{
+{ PRINT(1)("testerror\n");
   this->setClassID(CL_SCRIPT_TRIGGER, "ScriptTrigger");
   this->toList(OM_COMMON);