Changeset 9061 in orxonox.OLD for trunk/src/lib/script_engine

Timestamp:

Jul 3, 2006, 6:39:10 PM (19 years ago)

Author:

patrick

Message:

merged the single_player branche to trunk

Location:

trunk/src/lib/script_engine

Files:

• script.cc (modified) (6 diffs)
• script.h (modified) (1 diff)

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))
-//                               ):
+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("executeFunction", ExecutorLua0ret<Script,bool >(&Script::executeFunction))
+                     );
 
 Script::Script(const TiXmlElement* root)
@@ -81 +82 @@
    filedest += "scripts/" + filename;
    
+   this->addThisScript();
+   this->registerStandartClasses();
+   
    if(currentFile.length() != 0)
    {
@@ -97 +101 @@
      {
       currentFile = filename;
-      //this->addThisScript();
       return true;
      }
@@ -119 +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);
@@ -163 +166 @@
  }
 
- bool Script::selectFunction(std::string& functionName, int retCount)
+ bool Script::selectFunction(const std::string& functionName, int retCount)
  {
    if(returnCount == 0 && currentFunction.length() == 0) //no return values left on the stack and no other function selected
@@ -356 +359 @@
    
    //success = this->registerClass(std::string("Vector"));
-   
+    success = this->registerClass("ScriptTrigger");
+
    return success;
  }

trunk/src/lib/script_engine/script.h

@@ -42 +42 @@
     /// EXECUTING
     // first select function
-    bool selectFunction(std::string& functionName, int retCount);
+    bool selectFunction(const std::string& functionName, int retCount);
 
     // push parameters for luafunction