Changeset 6444 in orxonox.OLD for trunk/src/world_entities/weapons/weapon_manager.h
- Timestamp:
- Jan 8, 2006, 10:45:03 PM (18 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/world_entities/weapons/weapon_manager.h
r6442 r6444 9 9 * @TODO 1. WeaponManager should also handle a List of availiableWeapons. 10 10 */ 11 12 #ifndef _WEAPON_MANAGER_H 13 #define _WEAPON_MANAGER_H 11 14 12 15 #include "base_object.h" … … 70 73 void addWeapon(Weapon* weapon, int configID = -1, int slotID = -1); 71 74 void removeWeapon(Weapon* weapon, int configID = -1); 72 Weapon* getWeapon(int slotID) const { return (slotID >= 0 && slotID < this->slotCount)? this->currentSlotConfig[slotID]. currentWeapon: NULL; };75 Weapon* getWeapon(int slotID) const { return (slotID >= 0 && slotID < this->slotCount)? this->currentSlotConfig[slotID].nextWeapon: NULL; }; 73 76 74 77 // FIXME :: … … 109 112 tAnimation<Crosshair>* crossHairSizeAnim; //!< An animation for the crosshair (scaling) 110 113 }; 114 115 116 #endif /* _WEAPON_MANAGER_H */
Note: See TracChangeset
for help on using the changeset viewer.