- Timestamp:
- Mar 23, 2009, 2:39:47 PM (16 years ago)
- Location:
- code/branches/pickups/src/orxonox/objects/worldentities/pawns
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/pickups/src/orxonox/objects/worldentities/pawns/Pawn.cc
r2826 r2831 33 33 #include "core/CoreIncludes.h" 34 34 #include "core/XMLPort.h" 35 #include "util/Exception.h" 35 36 #include "util/Math.h" 36 37 #include "PawnManager.h" … … 61 62 this->spawnparticleduration_ = 3.0f; 62 63 63 this->getPickUp().setPlayer(this);64 65 64 if (Core::isMaster()) 66 65 { … … 267 266 void Pawn::dropItems() 268 267 { 269 pickUp.eraseAll();268 ThrowException(NotImplemented, "Pickupsystem not implemented yet."); 270 269 } 271 270 -
code/branches/pickups/src/orxonox/objects/worldentities/pawns/Pawn.h
r2826 r2831 31 31 32 32 #include "OrxonoxPrereqs.h" 33 #include "objects/pickup/ShipEquipment.h"34 33 #include "objects/worldentities/ControllableEntity.h" 35 34 #include "objects/RadarViewable.h" … … 107 106 { return this->numexplosionchunks_; } 108 107 109 inline ShipEquipment& getPickUp()110 {return this->pickUp;}111 112 108 virtual void dropItems(); 113 109 … … 117 113 virtual void spawneffect(); 118 114 119 ShipEquipment pickUp;120 115 bool bAlive_; 121 116
Note: See TracChangeset
for help on using the changeset viewer.