Changeset 7889 for code/trunk/src/orxonox/worldentities/pawns
- Timestamp:
- Feb 14, 2011, 8:24:00 PM (14 years ago)
- Location:
- code/trunk/src/orxonox/worldentities/pawns
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk/src/orxonox/worldentities/pawns/Pawn.cc
r7533 r7889 145 145 } 146 146 147 void Pawn::preDestroy() 148 { 149 // yay, multiple inheritance! 150 this->ControllableEntity::preDestroy(); 151 this->PickupCarrier::preDestroy(); 152 } 153 147 154 void Pawn::setPlayer(PlayerInfo* player) 148 155 { -
code/trunk/src/orxonox/worldentities/pawns/Pawn.h
r7655 r7889 132 132 133 133 protected: 134 virtual void preDestroy(); 135 134 136 virtual void setPlayer(PlayerInfo* player); 135 137 virtual void removePlayer();
Note: See TracChangeset
for help on using the changeset viewer.