- Timestamp:
- Nov 12, 2008, 4:45:50 PM (17 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/weapon2/src/orxonox/objects/weaponSystem/Weapon.h
r2186 r2203 35 35 #include "tools/BillboardSet.h" 36 36 #include "tools/Timer.h" 37 #include "core/Identifier.h" 38 39 #include "WeaponSystem.h" 40 #include "Munition.h" 37 41 38 42 namespace orxonox … … 47 51 48 52 virtual void fire(); 53 void timer(); 49 54 void reloaded(); 55 void attachNeededMunition(std::string munitionType); 56 57 //get and set functions 50 58 virtual void setParentWeaponSystem(); 51 void attachNeededMunition(Munition *munitionPointer); 59 Munition * getAttachedMunition(); 60 void setLoadingTime(float loadingTime); 61 float getLoadingTime(); 62 void setWeaponReadyToShoot(bool b); 63 bool getWeaponReadyToShoot(); 64 Timer<Weapon> *getTimer(); 52 65 53 66 inline void setParentWeaponSlot(WeaponSlot *parentWeaponSlot) … … 56 69 { return parentWeaponSlot_; }; 57 70 58 59 60 61 71 private: 62 72 bool weaponReadyToShoot_; 63 73 float loadingTime_; 64 Munition *pointerToMunition_; 74 Munition *munition_; 75 65 76 WeaponSlot *parentWeaponSlot_; 66 77 WeaponSystem *parentWeaponSystem_; 78 SubclassIdentifier<Munition> munitionIdentifier_; 67 79 Timer<Weapon> reloadTimer_; 68 69 70 80 }; 71 81 }
Note: See TracChangeset
for help on using the changeset viewer.