Changeset 8978 in orxonox.OLD for branches/single_player_map/src/lib/script_engine/script.cc

Timestamp:

Jul 1, 2006, 2:48:17 PM (19 years ago)

Author:

snellen

Message:

perpared possibility to add the script object to the lua script itself (so that all objects can be added from within the script ), prepared possibility to create triggers form within a script

File:

• branches/single_player_map/src/lib/script_engine/script.cc (modified) (4 diffs)

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

@@ -24 +24 @@
 
 #include "class_list.h"
+// uncommet this when the std:string and the const bug is fixed
+//CREATE_SCRIPTABLE_CLASS(Script, CL_SCRIPT,
+//                               addMethod("addObject", ExecutorLua2<Script,std::string,std::string>(&Script::addObject))
+//                               ):
 
 Script::Script(const TiXmlElement* root)
@@ -73 +77 @@
 bool Script::loadFile(const std::string& filename)
  {
-
+   this->setName(filename);
    std::string filedest(ResourceManager::getInstance()->getDataDir());
    filedest += "scripts/" + filename;
@@ -93 +97 @@
      {
       currentFile = filename;
+      //this->addThisScript();
       return true;
      }
@@ -323 +328 @@
  }
 
+
+void Script::addThisScript()
+{
+  BaseObject* scriptClass = ClassList::getObject("Script", CL_SCRIPT_CLASS);
+   if (scriptClass != NULL)
+   {
+     static_cast<ScriptClass*>(scriptClass)->registerClass(this);
+     static_cast<ScriptClass*>(scriptClass)->insertObject(this, this, false);
+   }
+}
+
  int Script::reportError(int error)
  {