Changeset 8379 in orxonox.OLD for branches

Timestamp:

Jun 14, 2006, 12:44:31 PM (18 years ago)

Author:

snellen

Message:

Obj is now correctly inserted into the script

Location:

branches/script_engine/src

Files:

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

branches/script_engine/src/lib/script_engine/object.cc

@@ -14 +14 @@
 
      Object(lua_State* L) {callCount = 0; }
-     Object(){callCount = 0;};
+     Object(){callCount = 0;this->setClassID(CL_ACCOUNT, "Object");};
      ~Object() { printf("deleted Object (%p)\n", this); }
 

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

@@ -97 +97 @@
    
    BaseObject* scriptClass = ClassList::getObject(className, CL_SCRIPT_CLASS);
+   printf("The script class for %s is at %p \n",className.c_str(),scriptClass);
    WorldObject tmpObj;
    if (scriptClass != NULL)
@@ -109 +110 @@
      if (object != NULL && !objectIsAdded(objectName))
      {
+        printf("%s is at %p \n",objectName.c_str(),object);
         static_cast<ScriptClass*>(scriptClass)->insertObject(this, object, false);
         tmpObj.name = objectName;

branches/script_engine/src/world_entities/script_trigger.cc

@@ -14 +14 @@
   this->toList(OM_COMMON);
 
-  debugDraw = false;
+  doDebugDraw = false;
   scriptCalled = false;
   scriptIsOk = false;
@@ -57 +57 @@
         .defaultValues("");
     LoadParam(root, "debugdraw", this, ScriptTrigger, setDebugDraw)
-        .describe("True if the script shoul only be called once")
+        .describe("True if the script should only be called once")
         .defaultValues("");
   }