- Timestamp:
- Nov 26, 2008, 7:42:29 PM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/weapon2/src/orxonox/objects/weaponSystem/WeaponSystem.cc
r2272 r2288 36 36 37 37 #include "WeaponSystem.h" 38 #include "WeaponPack.h" 38 39 39 40 /* WEAPONSYSTEM … … 56 57 WeaponSystem::~WeaponSystem() 57 58 { 59 } 60 61 void WeaponSystem::attachWeaponPack(WeaponPack *wPack, int setNumber) 62 { 63 this->weaponSets_[setNumber]->attachWeaponPack(wPack); 64 } 65 66 void WeaponSystem::attachWeaponSlot(WeaponSlot *wSlot) 67 { 68 this->weaponSlots_.push_back(wSlot); 69 wSlot->setParentWeaponSystem(this); 58 70 } 59 71 … … 90 102 void WeaponSystem::fire(WeaponMode::Enum n) 91 103 { 104 COUT(0) << "WeaponSystem::fire" << std::endl; 92 105 if (n < (int)this->weaponSets_.size()) 93 this->weaponSets_[n]->fire(); 106 COUT(0) << "WeaponSystem::fire - after if" << std::endl; 107 //this->weaponSets_[n]->fire(); 94 108 } 95 109 … … 103 117 } 104 118 119 WeaponSlot * WeaponSystem::getWeaponSlotPointer(unsigned int n) 120 { 121 if (n < this->weaponSlots_.size()) 122 return this->weaponSlots_[n]; 123 else 124 return 0; 125 } 126 105 127 void WeaponSystem::XMLPort(Element& xmlelement, XMLPort::Mode mode) 106 128 {
Note: See TracChangeset
for help on using the changeset viewer.