Changeset 9020 in orxonox.OLD

Timestamp:

Jul 2, 2006, 4:42:20 PM (18 years ago)

Author:

snellen

Message:

made scripttrigger scriptable

Location:

branches/single_player_map/src

Files:

• lib/script_engine/script.cc (modified) (1 diff)
• world_entities/npcs/generic_npc.cc (modified) (1 diff)
• world_entities/script_trigger.cc (modified) (1 diff)

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,const std::string&, const std::string& >(&Script::addObject))
-                               );
+                    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)

branches/single_player_map/src/world_entities/npcs/generic_npc.cc

@@ -49 +49 @@
                         ->addMethod("setAbsCoor", ExecutorLua3<PNode,float,float,float>(&PNode::setAbsCoor))
                         ->addMethod("setAbsDir", ExecutorLua4<PNode,float,float,float,float>(&PNode::setAbsDir))
-
                        );
 

branches/single_player_map/src/world_entities/script_trigger.cc

@@ -38 +38 @@
              ->addMethod("setDebugDraw", ExecutorLua1<ScriptTrigger, bool>(&ScriptTrigger::setDebugDraw))
              ->addMethod("setAddToScript", ExecutorLua1<ScriptTrigger, bool>(&ScriptTrigger::setAddToScript))
-                       );
+             );