Changeset 11184 for code/branches/tgidronFS16/src/orxonox/weaponsystem
- Timestamp:
- May 12, 2016, 4:02:21 PM (9 years ago)
- Location:
- code/branches/tgidronFS16
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/tgidronFS16
- Property svn:mergeinfo changed
/code/trunk (added) merged: 11156-11157,11160-11161,11176
- Property svn:mergeinfo changed
-
code/branches/tgidronFS16/src/orxonox/weaponsystem/WeaponSystem.h
r11071 r11184 55 55 void removeWeaponSlot(WeaponSlot * wSlot); 56 56 WeaponSlot * getWeaponSlot(unsigned int index) const; 57 inline const std::vector<WeaponSlot *>& getAllWeaponSlots() const 58 { return weaponSlots_; } 57 59 58 60 // adding and removing WeaponSets
Note: See TracChangeset
for help on using the changeset viewer.