Changeset 9031 in orxonox.OLD for branches/single_player_map/src/world_entities

Timestamp:

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

Author:

snellen

Message:

added some methods to generic npcs scriptable

Location:

branches/single_player_map/src/world_entities

Files:

• npcs/generic_npc.cc (modified) (1 diff)
• playable.h (modified) (1 diff)
• space_ships/space_ship.cc (modified) (1 diff)

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

@@ -40 +40 @@
                         ->addMethod("turnTo", ExecutorLua1<GenericNPC,float>(&GenericNPC::turnTo))
                         ->addMethod("finalGoalReached", ExecutorLua0ret<GenericNPC,bool>(&GenericNPC::finalGoalReached))
+                        // Animation and sound
+                        ->addMethod("playAnimation", ExecutorLua2<GenericNPC,int,int>(&GenericNPC::playAnimation))
+                        //->addMethod("playSound", ExecutorLua1<GenericNPC,const std::string&>(&GenericNPC::playSound))
                         // Display
                         ->addMethod("hide", ExecutorLua0<WorldEntity>(&WorldEntity::hide))

branches/single_player_map/src/world_entities/playable.h

@@ -56 +56 @@
 
   // Player Settup
+  bool hasPlayer(){return !(this->currentPlayer == NULL);}
   bool setPlayer(Player* player);
   Player* getCurrentPlayer() const { return this->currentPlayer; };

branches/single_player_map/src/world_entities/space_ships/space_ship.cc

@@ -55 +55 @@
 
 CREATE_FACTORY(SpaceShip, CL_SPACE_SHIP);
-
+#include "script_class.h"
+CREATE_SCRIPTABLE_CLASS(SpaceShip, CL_SPACE_SHIP,
+                        addMethod("hasPlayer", ExecutorLua0ret<Playable,bool>(&Playable::hasPlayer))
+                       );
 
 /**