- Timestamp:
- Dec 10, 2008, 2:38:33 PM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/weapon2/src/orxonox/objects/weaponSystem/Weapon.h
r2366 r2379 55 55 56 56 //reloading 57 void bulletTimer( );58 void magazineTimer( );57 void bulletTimer(float bulletLoadingTime); 58 void magazineTimer(float magazineLoadingTime); 59 59 void bulletReloaded(); 60 60 void magazineReloaded(); … … 63 63 void setMagazineLoadingTime(float loadingTime); 64 64 float getMagazineLoadingTime(); 65 void setBulletReadyToShoot(bool b);66 bool getBulletReadyToShoot();67 void setMagazineReadyToShoot(bool b);68 bool getMagazineReadyToShoot();69 65 Timer<Weapon> *getBulletTimer(); 70 66 Timer<Weapon> *getMagazineTimer(); … … 72 68 virtual void setMunitionType(std::string munitionType); 73 69 virtual const std::string getMunitionType(); 70 71 virtual void takeBullets(); 72 virtual void takeMagazines(); 73 virtual void createProjectile(); 74 74 75 75 inline void setParentWeaponSlot(WeaponSlot *parentWeaponSlot) … … 81 81 inline WeaponSystem * getParentWeaponSystem() 82 82 { return this->parentWeaponSystem_; }; 83 84 //in future by XMLPort, 85 virtual void setWeapon(); 83 86 84 87 private:
Note: See TracChangeset
for help on using the changeset viewer.