- Timestamp:
- May 23, 2009, 9:57:52 PM (15 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/gametypes (added) merged: 2827,2903,2905-2906,2933-2936,2952,2954,2961,2970-2971,2978,2985-2986,3019-3020
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/objects/worldentities/triggers/PlayerTrigger.h
r2662 r3033 60 60 @return Returns a pointer to the ControllableEntity that triggered the PlayerTrigger. 61 61 */ 62 inline ControllableEntity* getTriggeringPlayer(void) const62 inline Pawn* getTriggeringPlayer(void) const 63 63 { return this->player_; } 64 64 … … 77 77 @param player A pointer to the ControllableEntity that triggered the PlayerTrigger. 78 78 */ 79 inline void setTriggeringPlayer( ControllableEntity* player)79 inline void setTriggeringPlayer(Pawn* player) 80 80 { this->player_ = player; } 81 81 … … 88 88 89 89 private: 90 ControllableEntity* player_; //!< The player that triggered the PlayerTrigger.90 Pawn* player_; //!< The player that triggered the PlayerTrigger. 91 91 bool isForPlayer_; //!< Is true when the PlayerTrigger schould be set to normally be triggered by ControllableEntities. 92 92
Note: See TracChangeset
for help on using the changeset viewer.