Changeset 10369 in orxonox.OLD

Timestamp:

Jan 25, 2007, 4:42:51 PM (17 years ago)

Author:

snellen

Message:

Added some errormessages in script.cc

Location:

branches/scriptchanges.new/src

Files:

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

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

@@ -111 +111 @@
    if(currentFile.length() != 0)
    {
-     printf("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());
+     printf("ERROR IN SCRIPT %s :   Could not load %s because an other file is already loaded: %s\n",currentFile.c_str(),filename.c_str(), currentFile.c_str());
      return false;
     }
@@ -128 +128 @@
      else
      {
-       printf("SCRIPT %s : ERROR: while loading file %s: \n",currentFile.c_str(),filename.c_str());
        reportError(error);
      }
@@ -135 +134 @@
    else
    {
-     printf("SCRIPT %s : ERROR: while loading file %s: \n",currentFile.c_str(),filename.c_str());
      reportError(error);
    }
 
-   printf("SCRIPT : ERROR: while loading file %s \n",filename.c_str());
+   printf("ERROR IN SCRIPT:  Could not load file %s \n",filename.c_str());
    return false;
  }
@@ -166 +164 @@
         tmpObj.name = objectName;
         registeredObjects.push_back(tmpObj);
-     }
-   }
+        return;
+     }
+   }
+   printf("ERROR IN SCRIPT %s: Could not add %s of class %s\n",this->currentFile.c_str(),objectName.c_str(),className.c_str());
  }
 
@@ -188 +188 @@
         tmpObj.name = objectName;
         registeredObjects.push_back(tmpObj);
-     }
-   }
+        return;
+     }
+   }
+   printf("ERROR IN SCRIPT %s: Could not add %s of class %s\n",this->currentFile.c_str(),objectName.c_str(),className.c_str());
  }
 
@@ -229 +231 @@
    }
    else
-     printf("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());
+     printf("ERROR IN SCRIPT %s :   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;
  }
@@ -256 +258 @@
    }
    else
-     PRINTF(1)("SCRIPT '%s' : no function selected.\n",currentFile.c_str());
+     PRINTF(1)("SCRIPT '%s' : No function selected.\n",currentFile.c_str());
 
    return false;
@@ -273 +275 @@
    else
    {
-     printf("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());
+     printf("ERROR IN SCRIPT %s :   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;
    }
@@ -290 +292 @@
    else
    {
-     printf("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());
+     printf("ERROR IN SCRIPT %s :   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;
    }
@@ -306 +308 @@
    else
    {
-     printf("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());
+     printf("ERROR IN SCRIPT %s :  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;
    }
@@ -341 +343 @@
      }
      else
-       printf("SCRIPT %s : ERROR: Trying to retreive non bolean value\n",this->currentFile.c_str());
+       printf("ERROR IN SCRIPT %s :  Trying to retreive non bolean value\n",this->currentFile.c_str());
    }
    return returnValue;
@@ -394 +396 @@
   const char *msg = lua_tostring(luaState, -1);
   if (msg == NULL) msg = "(error with no message)\n";
-  printf("ERROR: %s\n", msg);
+  printf("ERROR IN SCRIPT %s : %s\n",currentFile.c_str(), msg);
   lua_pop(luaState, 1);
  }

branches/scriptchanges.new/src/world_entities/creatures/fps_player.cc

@@ -342 +342 @@
   velocity *= 100;
 
+  if( this->bJump)
+  {
+    printf("position:( %f, %f, %f ) \n", this->getAbsCoorX(), this->getAbsCoorY(), this->getAbsCoorZ());
+  }
   if( this->getModel( 0) != NULL && this->getModel(0)->isA(InteractiveModel::staticClassID()))
   {