Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8259 in orxonox.OLD for branches/script_engine/src


Ignore:
Timestamp:
Jun 8, 2006, 3:52:57 PM (18 years ago)
Author:
snellen
Message:

should work now

Location:
branches/script_engine/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/script_engine/src/lib/Makefile.am

    r8061 r8259  
    1616                util/executor/executor.cc \
    1717                util/executor/executor_functional.cc \
     18                util/executor/executor_lua.cc \
    1819                \
    1920                util/loading/resource_manager.cc \
     
    4546                util/executor/executor_functional.h \
    4647                util/executor/executor_xml.h \
     48                util/executor/executor_lua.h \
    4749                util/executor/functor_list.h \
     50                \
    4851                util/preferences.h \
    4952                util/threading.h \
  • branches/script_engine/src/story_entities/game_world.cc

    r8240 r8259  
    139139}
    140140
    141 
     141#include "account.cc"
     142#include "object.cc"
    142143/**
    143144 *  loads the GameWorld by initializing all resources, and set their default values.
     
    181182  this->dataXML = (TiXmlElement*)root->Clone();
    182183
     184
     185  Object* obj= new Object();
     186  obj->setName("Obj");
     187  Account a;
     188  a.setName("a");
     189  Account *b = new Account(30);
     190  b->setName("b");
     191 
    183192  LoadParamXML(root, "ScriptManager", &this->scriptManager, ScriptManager, loadParams);
    184193
  • branches/script_engine/src/world_entities/script_trigger.cc

    r8246 r8259  
    4949    LoadParam(root, "triggerparent", this, ScriptTrigger, setTriggerParent)
    5050        .describe("The name of the parent as it is in the *.oxw file")
     51        .defaultValues("");
     52    LoadParam(root, "callonce", this, ScriptTrigger, setCallOnce)
     53        .describe("True if the script shoul only be called once")
    5154        .defaultValues("");
    5255  }
     
    107110     if(scriptIsOk)
    108111     {
     112       testScriptingFramework();
    109113     if(!(script->selectFunction(this->functionName,0)) )
    110114       printf("Error ScriptTrigger: Selection of %s in %s failed.\n",functionName.c_str(), script->getFileName().c_str());
Note: See TracChangeset for help on using the changeset viewer.