Changeset 8259 in orxonox.OLD for branches

Timestamp:

Jun 8, 2006, 3:52:57 PM (18 years ago)

Author:

snellen

Message:

should work now

Location:

branches/script_engine/src

Files:

• lib/Makefile.am (modified) (2 diffs)
• story_entities/game_world.cc (modified) (2 diffs)
• world_entities/script_trigger.cc (modified) (2 diffs)

branches/script_engine/src/lib/Makefile.am

@@ -16 +16 @@
                 util/executor/executor.cc \
                 util/executor/executor_functional.cc \
+                util/executor/executor_lua.cc \
                 \
                 util/loading/resource_manager.cc \
@@ -45 +46 @@
                 util/executor/executor_functional.h \
                 util/executor/executor_xml.h \
+                util/executor/executor_lua.h \
                 util/executor/functor_list.h \
+                \
                 util/preferences.h \
                 util/threading.h \

branches/script_engine/src/story_entities/game_world.cc

@@ -139 +139 @@
 }
 
-
+#include "account.cc"
+#include "object.cc"
 /**
  *  loads the GameWorld by initializing all resources, and set their default values.
@@ -181 +182 @@
   this->dataXML = (TiXmlElement*)root->Clone();
 
+
+  Object* obj= new Object();
+  obj->setName("Obj");
+  Account a;
+  a.setName("a");
+  Account *b = new Account(30);
+  b->setName("b");
+  
   LoadParamXML(root, "ScriptManager", &this->scriptManager, ScriptManager, loadParams);
 

branches/script_engine/src/world_entities/script_trigger.cc

@@ -49 +49 @@
     LoadParam(root, "triggerparent", this, ScriptTrigger, setTriggerParent)
         .describe("The name of the parent as it is in the *.oxw file")
+        .defaultValues("");
+    LoadParam(root, "callonce", this, ScriptTrigger, setCallOnce)
+        .describe("True if the script shoul only be called once")
         .defaultValues("");
   }
@@ -107 +110 @@
      if(scriptIsOk)
      {
+       testScriptingFramework();
      if(!(script->selectFunction(this->functionName,0)) )
        printf("Error ScriptTrigger: Selection of %s in %s failed.\n",functionName.c_str(), script->getFileName().c_str());