Changeset 8289 in orxonox.OLD for branches/script_engine/src/lib

Timestamp:

Jun 8, 2006, 7:43:10 PM (18 years ago)

Author:

snellen

Message:

added some debug output, script gets called

Location:

branches/script_engine/src/lib/script_engine

Files:

• script.cc (modified) (6 diffs)
• script_class.h (modified) (1 diff)
• script_manager.cc (modified) (3 diffs)

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

@@ -23 +23 @@
   luaopen_math(luaState);
   luaopen_debug(luaState);
-
   if (root != NULL)
     this->loadParams(root);
@@ -77 +76 @@
      else
      {
-      reportError(error);
-     }
-
-   }
-   else
-   {
+       printf("ERROR while loading file %s: ",filename.c_str());
+       reportError(error);
+     }
+
+   }
+   else
+   {
+     printf("ERROR while loading file %s: ",filename.c_str());
      reportError(error);
    }
@@ -92 +93 @@
  void Script::addObject(const std::string& className, const std::string& objectName)
  {
+   printf("Script: I am about to add %s of class %s\n",objectName.c_str(),className.c_str());
+   
    BaseObject* scriptClass = ClassList::getObject(className, CL_SCRIPT_CLASS);
    WorldObject tmpObj;
@@ -162 +165 @@
     if(error != 0)
     {
+     printf("ERROR while executing function %s: \n",currentFunction.c_str());
      reportError(error);
+     //clean up
+     currentFunction.assign(""); 
+     argumentCount = returnCount = 0;
      return false;
     }
@@ -174 +181 @@
    else
      printf("Error: no function selected.\n");
+   
+   return false;
  }
 
@@ -296 +305 @@
   fprintf(stderr, "ERROR: %s\n", msg);
   lua_pop(luaState, 1);
+ }
   return error;
  }
- }
 
 

branches/script_engine/src/lib/script_engine/script_class.h

@@ -61 +61 @@
     virtual int insertObject(Script* L, BaseObject* obj, bool gc=false)
     {
-      Lunar<T>::insertObject(L, dynamic_cast<T*>(obj), obj->getName(), gc);
+      return Lunar<T>::insertObject(L, dynamic_cast<T*>(obj), obj->getName(), gc);
     }
 

branches/script_engine/src/lib/script_engine/script_manager.cc

@@ -1 +1 @@
 #include <string>
 #include <list>
+
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD
 
 
@@ -19 +21 @@
 {
   this->setName("ScriptManager");
-  printf("ScriptManager created\n");
   this->scripts = NULL;
   this->triggers = NULL;
@@ -74 +75 @@
   LOAD_PARAM_START_CYCLE(triggers, object);
   {
-    new ScriptTrigger(object);PRINTF(0)("test output from createtriggers\n");
+    new ScriptTrigger(object);
   }
   LOAD_PARAM_END_CYCLE(object);