Changeset 2986 for code/branches/gametypes/src/orxonox/objects/worldentities/triggers/PlayerTrigger.h

Timestamp:

May 18, 2009, 6:00:13 PM (15 years ago)

Author:

Aurelian

Message:

Respawning changed, not possible anymore, not completely working. Movable Entity is now able to cause damage.

File:

• code/branches/gametypes/src/orxonox/objects/worldentities/triggers/PlayerTrigger.h (modified) (3 diffs)

code/branches/gametypes/src/orxonox/objects/worldentities/triggers/PlayerTrigger.h

@@ -60 +60 @@
         @return Returns a pointer to the ControllableEntity that triggered the PlayerTrigger.
         */
-        inline ControllableEntity* getTriggeringPlayer(void) const
+        inline Pawn* getTriggeringPlayer(void) const
             { return this->player_; }
         
@@ -77 +77 @@
         @param player A pointer to the ControllableEntity that triggered the PlayerTrigger.
         */
-        inline void setTriggeringPlayer(ControllableEntity* player)
+        inline void setTriggeringPlayer(Pawn* player)
            { this->player_ = player; }
 
@@ -88 +88 @@
         
     private:
-        ControllableEntity* player_; //!< The player that triggered the PlayerTrigger.
+        Pawn* player_; //!< The player that triggered the PlayerTrigger.
         bool isForPlayer_; //!< Is true when the PlayerTrigger schould be set to normally be triggered by ControllableEntities.