Changeset 3038 for code/trunk/src/orxonox/objects/worldentities/pawns
- Timestamp:
- May 24, 2009, 5:42:50 PM (16 years ago)
- Location:
- code/trunk/src/orxonox/objects/worldentities/pawns
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk/src/orxonox/objects/worldentities/pawns/Pawn.cc
r3033 r3038 209 209 this->getGametype()->pawnKilled(this, this->lastHitOriginator_); 210 210 211 if (this->getPlayer() )212 this->getPlayer()->stopControl( this);211 if (this->getPlayer() && this->getPlayer()->getControllableEntity() == this) 212 this->getPlayer()->stopControl(); 213 213 214 214 if (GameMode::isMaster()) -
code/trunk/src/orxonox/objects/worldentities/pawns/Pawn.h
r2826 r3038 47 47 virtual void tick(float dt); 48 48 void registerVariables(); 49 50 virtual void setPlayer(PlayerInfo* player);51 virtual void removePlayer();52 49 53 50 inline bool isAlive() const … … 113 110 114 111 protected: 112 virtual void setPlayer(PlayerInfo* player); 113 virtual void removePlayer(); 114 115 115 virtual void death(); 116 116 virtual void deatheffect(); -
code/trunk/src/orxonox/objects/worldentities/pawns/Spectator.h
r2662 r3038 46 46 virtual void tick(float dt); 47 47 48 virtual void setPlayer(PlayerInfo* player);49 virtual void startLocalHumanControl();50 51 48 virtual void moveFrontBack(const Vector2& value); 52 49 virtual void moveRightLeft(const Vector2& value); … … 59 56 virtual void fire(WeaponMode::Enum fireMode); 60 57 virtual void greet(); 58 59 protected: 60 virtual void setPlayer(PlayerInfo* player); 61 virtual void startLocalHumanControl(); 61 62 62 63 private:
Note: See TracChangeset
for help on using the changeset viewer.