Changeset 9241 in orxonox.OLD

Timestamp:

Jul 6, 2006, 12:44:18 PM (18 years ago)

Author:

snellen

Message:

error messages von script, scrripttrigger und scriptmanager ans framework angepasst

Location:

branches/scripting/src

Files:

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

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

@@ -17 +17 @@
 #include "script_class.h"
 #include "luaincl.h"
-
+#include "debug.h"
 #include "util/loading/resource_manager.h"
 
@@ -87 +87 @@
    if(currentFile.length() != 0)
    {
-     printf("Could not load %s because an other file is already loaded: %s\n",filename.c_str(), currentFile.c_str());
+     PRINT(1)("Could not load %s because an other file is already loaded: %s\n",filename.c_str(), currentFile.c_str());
      return false;
     }
@@ -104 +104 @@
      else
      {
-       printf("ERROR while loading file %s: \n",filename.c_str());
+       PRINT(1)("ERROR while loading file %s: \n",filename.c_str());
        reportError(error);
      }
@@ -111 +111 @@
    else
    {
-     printf("ERROR while loading file %s: \n",filename.c_str());
+     PRINT(1)("ERROR while loading file %s: \n",filename.c_str());
      reportError(error);
    }
@@ -150 +150 @@
  bool Script::executeFile()
  {
-   printf("WARNING: script.executeFile is not implemented yet");
+   PRINT(2)("WARNING: script.executeFile is not implemented yet");
    /*if(currentFile.length() != 0)
    {
@@ -183 +183 @@
    }
    else
-     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());
+     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());
    return false;
  }
@@ -195 +195 @@
     if(error != 0)
     {
-     printf("ERROR while executing function %s: \n",currentFunction.c_str());
+      PRINT(1)("ERROR while executing function %s: \n",currentFunction.c_str());
      reportError(error);
      //clean up
@@ -210 +210 @@
    }
    else
-     printf("Error: no function selected.\n");
+     PRINT(1)("Error: no function selected.\n");
 
    return false;
@@ -227 +227 @@
    else
    {
-    printf("Couldn't add parameter because the wrong function is selected: %s instead of %s\n", currentFunction.c_str(), toFunction.c_str());
+     PRINT(1)("Couldn't add parameter because the wrong function is selected: %s instead of %s\n", currentFunction.c_str(), toFunction.c_str());
     return false;
    }
@@ -244 +244 @@
    else
    {
-     printf("Couldn't add parameter because the wrong function is selected: %s instead of %s\n", currentFunction.c_str(), toFunction.c_str());
+     PRINT(1)("Couldn't add parameter because the wrong function is selected: %s instead of %s\n", currentFunction.c_str(), toFunction.c_str());
      return false;
    }
@@ -260 +260 @@
    else
    {
-     printf("Couldn't add parameter because the wrong function is selected: %s instead of %s\n", currentFunction.c_str(), toFunction.c_str());
+     PRINT(1)("Couldn't add parameter because the wrong function is selected: %s instead of %s\n", currentFunction.c_str(), toFunction.c_str());
      return false;
    }
@@ -295 +295 @@
      }
      else
-       printf("ERROR: Form %s : trying to retreive non bolean value",this->currentFile.c_str());
+       PRINT(1)("ERROR: Form %s : trying to retreive non bolean value",this->currentFile.c_str());
    }
    return returnValue;

branches/scripting/src/world_entities/npcs/gate.cc

@@ -41 +41 @@
                             addMethod("hide", ExecutorLua0<WorldEntity>(&WorldEntity::hide))
                             ->addMethod("unhide", ExecutorLua0<WorldEntity>(&WorldEntity::unhide))
-                           // ->addMethod("destroy", ExecutorLua0<Gate>(&Gate::destroy()))    
+                            ->addMethod("destroy", ExecutorLua0<Gate>(&Gate::destroy))    
                             ->addMethod("setAbsCoor", ExecutorLua3<PNode,float,float,float>(&PNode::setAbsCoor))
                             ->addMethod("getAbsCoorX", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorX))

branches/scripting/src/world_entities/script_trigger.cc

@@ -202 +202 @@
        //testScriptingFramework();
     if(!(script->selectFunction(this->functionName,returnCount)) )
-      printf("Error ScriptTrigger: Selection of %s in %s failed.\n",functionName.c_str(), script->getFileName().c_str());
+      PRINT(1)("Error ScriptTrigger: Selection of %s in %s failed.\n",functionName.c_str(), script->getFileName().c_str());
      
     script->pushParam( timestep, this->functionName);
      
     if( !(script->executeFunction()) )
-      printf("Error ScriptTrigger: Execution of %s in %s failed.\n",functionName.c_str(), script->getFileName().c_str());
+      PRINT(1)("Error ScriptTrigger: Execution of %s in %s failed.\n",functionName.c_str(), script->getFileName().c_str());
      
     scriptFinished = script->getReturnedBool();