Changeset 6540 for code/trunk/src/orxonox/worldentities/pawns
- Timestamp:
- Mar 16, 2010, 9:35:11 PM (15 years ago)
- Location:
- code/trunk/src/orxonox/worldentities/pawns
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk/src/orxonox/worldentities/pawns/Pawn.cc
r6524 r6540 71 71 this->aimPosition_ = Vector3::ZERO; 72 72 73 //TODO: Remove.74 //this->getPickups().setOwner(this);75 76 73 if (GameMode::isMaster()) 77 74 { … … 297 294 } 298 295 299 //TODO: Remove.300 // void Pawn::dropItems()301 // {302 // this->getPickups().clear();303 // }304 305 306 296 /* WeaponSystem: 307 297 * functions load Slot, Set, Pack from XML and make sure all parent-pointers are set. -
code/trunk/src/orxonox/worldentities/pawns/Pawn.h
r6524 r6540 109 109 { return this->numexplosionchunks_; } 110 110 111 //TODO: Remove.112 // virtual void dropItems();113 // inline PickupCollection& getPickups()114 // { return this->pickups_; }115 // virtual void useItem()116 // { this->pickups_.useItem(); }117 118 111 virtual void startLocalHumanControl(); 119 112 … … 122 115 Vector3 getAimPosition() 123 116 { return this->aimPosition_; } 117 118 virtual const Vector3& getCarrierPosition(void) 119 { return this->getWorldPosition(); }; 124 120 125 121 protected: … … 136 132 bool bAlive_; 137 133 138 //TODO: Remove.139 //PickupCollection pickups_;140 134 virtual std::list<PickupCarrier*>* getCarrierChildren(void) 141 135 { return new std::list<PickupCarrier*>(); } 142 136 virtual PickupCarrier* getCarrierParent(void) 143 137 { return NULL; } 144 virtual const Vector3& getCarrierPosition(void)145 { return this->getWorldPosition(); };146 138 147 139 float health_;
Note: See TracChangeset
for help on using the changeset viewer.