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

Timestamp:

Jul 3, 2006, 1:41:42 PM (18 years ago)

Author:

snellen

Message:

added methods to generic npc

Location:

branches/single_player_map/src/lib/script_engine

Files:

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

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))
                      );
@@ -166 +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

branches/single_player_map/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