Changeset 9031 in orxonox.OLD for branches/single_player_map/src/lib/script_engine

Timestamp:

Jul 3, 2006, 1:35:40 PM (18 years ago)

Author:

snellen

Message:

added some methods to generic npcs scriptable

File:

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

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

@@ -26 +26 @@
 CREATE_SCRIPTABLE_CLASS(Script, CL_SCRIPT,
                     addMethod("addObject", ExecutorLua2<Script,const std::string&, const std::string& >(&Script::addObject))
-                    //->addMethod("selectFunction", ExecutorLua2ret<Script, bool, const std::string&, int >(&Script::selectFunction))
+                   // ->addMethod("selectFunction", ExecutorLua2ret<Script, bool, const std::string&, int >(&Script::selectFunction))
                     ->addMethod("executeFunction", ExecutorLua0ret<Script,bool >(&Script::executeFunction))
                      );
@@ -82 +82 @@
    filedest += "scripts/" + filename;
    
+   this->addThisScript();
+   this->registerStandartClasses();
+   
    if(currentFile.length() != 0)
    {
@@ -98 +101 @@
      {
       currentFile = filename;
-      this->addThisScript();
-      this->registerStandartClasses();
       return true;
      }
@@ -121 +122 @@
  void Script::addObject(const std::string& className, const std::string& objectName)
  {
-  // printf("Script %p: I am about to add %s of class %s\n",this,objectName.c_str(),className.c_str());
+   //printf("Script %s: I am about to add %s of class %s\n",this->getName(),objectName.c_str(),className.c_str());
 
    BaseObject* scriptClass = ClassList::getObject(className, CL_SCRIPT_CLASS);
@@ -359 +360 @@
    //success = this->registerClass(std::string("Vector"));
     success = this->registerClass("ScriptTrigger");
-    success = this->registerClass("Script");
-   
+
    return success;
  }