Changeset 6078 for code/branches/particles2/src/orxonox/worldentities
- Timestamp:
- Nov 17, 2009, 1:36:21 AM (15 years ago)
- Location:
- code/branches/particles2/src/orxonox/worldentities/pawns
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/particles2/src/orxonox/worldentities/pawns/Pawn.cc
r5929 r6078 110 110 XMLPortObject(Pawn, WeaponSlot, "weaponslots", addWeaponSlot, getWeaponSlot, xmlelement, mode); 111 111 XMLPortObject(Pawn, WeaponSet, "weaponsets", addWeaponSet, getWeaponSet, xmlelement, mode); 112 XMLPortObject(Pawn, WeaponPack, "weapons", addWeaponPack , getWeaponPack, xmlelement, mode);112 XMLPortObject(Pawn, WeaponPack, "weapons", addWeaponPackXML, getWeaponPack, xmlelement, mode); 113 113 } 114 114 … … 341 341 } 342 342 343 void Pawn::addWeaponPackXML(WeaponPack * wPack) 344 { 345 if (this->weaponSystem_) 346 if (!this->weaponSystem_->addWeaponPack(wPack)) 347 wPack->destroy(); 348 } 349 343 350 WeaponPack * Pawn::getWeaponPack(unsigned int index) const 344 351 { -
code/branches/particles2/src/orxonox/worldentities/pawns/Pawn.h
r5781 r6078 89 89 WeaponSet * getWeaponSet(unsigned int index) const; 90 90 void addWeaponPack(WeaponPack * wPack); 91 void addWeaponPackXML(WeaponPack * wPack); 91 92 WeaponPack * getWeaponPack(unsigned int index) const; 92 93
Note: See TracChangeset
for help on using the changeset viewer.