Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8379 in orxonox.OLD for branches


Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/script_engine/src/lib/script_engine/object.cc

    r8271 r8379  
    1414
    1515     Object(lua_State* L) {callCount = 0; }
    16      Object(){callCount = 0;};
     16     Object(){callCount = 0;this->setClassID(CL_ACCOUNT, "Object");};
    1717     ~Object() { printf("deleted Object (%p)\n", this); }
    1818
  • branches/script_engine/src/lib/script_engine/script.cc

    r8290 r8379  
    9797   
    9898   BaseObject* scriptClass = ClassList::getObject(className, CL_SCRIPT_CLASS);
     99   printf("The script class for %s is at %p \n",className.c_str(),scriptClass);
    99100   WorldObject tmpObj;
    100101   if (scriptClass != NULL)
     
    109110     if (object != NULL && !objectIsAdded(objectName))
    110111     {
     112        printf("%s is at %p \n",objectName.c_str(),object);
    111113        static_cast<ScriptClass*>(scriptClass)->insertObject(this, object, false);
    112114        tmpObj.name = objectName;
  • branches/script_engine/src/world_entities/script_trigger.cc

    r8304 r8379  
    1414  this->toList(OM_COMMON);
    1515
    16   debugDraw = false;
     16  doDebugDraw = false;
    1717  scriptCalled = false;
    1818  scriptIsOk = false;
     
    5757        .defaultValues("");
    5858    LoadParam(root, "debugdraw", this, ScriptTrigger, setDebugDraw)
    59         .describe("True if the script shoul only be called once")
     59        .describe("True if the script should only be called once")
    6060        .defaultValues("");
    6161  }
Note: See TracChangeset for help on using the changeset viewer.