Changeset 9032 in orxonox.OLD for branches

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

Files:

• lib/script_engine/script.cc (modified) (2 diffs)
• lib/script_engine/script.h (modified) (1 diff)
• world_entities/npcs/generic_npc.cc (modified) (2 diffs)
• world_entities/npcs/generic_npc.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

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

@@ -42 +42 @@
                         // Animation and sound
                         ->addMethod("playAnimation", ExecutorLua2<GenericNPC,int,int>(&GenericNPC::playAnimation))
-                        //->addMethod("playSound", ExecutorLua1<GenericNPC,const std::string&>(&GenericNPC::playSound))
+                        ->addMethod("playSound", ExecutorLua1<GenericNPC,const std::string&>(&GenericNPC::playSound))
                         // Display
                         ->addMethod("hide", ExecutorLua0<WorldEntity>(&WorldEntity::hide))
@@ -172 +172 @@
  * @param filename: name of the file
  */
-void GenericNPC::playSound(std::string filename)
+void GenericNPC::playSound(const std::string& filename)
 {}
 

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

@@ -68 +68 @@
   /* some generic control funtions */
   void playAnimation(int animationIndex, int animPlaybackMode);
-  void playSound(std::string filename);
+  void playSound(const std::string& filename);
   void playSound(int i);