Changeset 9003 in orxonox.OLD for trunk/src/lib/script_engine/script.cc

Timestamp:

Jul 2, 2006, 1:36:13 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the single_player_map branche back
merged with command:
svn merge -r8896:HEAD ​https://svn.orxonox.net/orxonox/branches/single_player_map .
no conflicts

File:

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

trunk/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,"thisscript", false);
+   }
+}
+
  int Script::reportError(int error)
  {