- Timestamp:
- Mar 19, 2009, 4:55:08 PM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/weaponsystem/src/orxonox/objects/weaponSystem/Weapon.h
r2778 r2804 62 62 void magazineReloaded(); 63 63 64 //XMLPort functions 64 65 virtual void setMunitionType(std::string munitionType); 65 66 virtual const std::string getMunitionType(); … … 70 71 virtual void setSharedMunition(bool bSharedMunition); 71 72 virtual const bool getSharedMunition(); 73 virtual void setBulletAmount(unsigned int amount); 74 virtual const unsigned int getBulletAmount(); 75 virtual void setMagazineAmount(unsigned int amount); 76 virtual const unsigned int getMagazineAmount(); 77 virtual void setUnlimitedMunition(bool unlimitedMunition); 78 virtual const bool getUnlimitedMunition(); 72 79 80 //weapon actions 73 81 virtual void takeBullets(); 74 82 virtual void takeMagazines(); 75 83 virtual void createProjectile(); 84 virtual void reloadBullet(); 85 virtual void reloadMagazine(); 76 86 87 //manually set or reset 88 virtual void setWeapon(); 89 virtual void setMunition(); 90 77 91 inline void setParentWeaponSystem(WeaponSystem *parentWeaponSystem) 78 92 { this->parentWeaponSystem_=parentWeaponSystem; }; … … 85 99 { return this->attachedToWeaponSlot_; } 86 100 87 virtual void setWeapon();88 101 89 102 private: … … 94 107 bool magazineReadyToShoot_; 95 108 bool bSharedMunition_; 109 bool unlimitedMunition_; 96 110 float bulletLoadingTime_; 97 111 float magazineLoadingTime_; 112 unsigned int bulletAmount_; 113 unsigned int magazineAmount_; 98 114 std::string munitionType_; 99 115
Note: See TracChangeset
for help on using the changeset viewer.