- Timestamp:
- Apr 8, 2009, 12:36:08 AM (15 years ago)
- Location:
- code/branches/questsystem5
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/questsystem5
- Property svn:mergeinfo changed
-
code/branches/questsystem5/src/orxonox/objects/weaponSystem/Weapon.h
r2662 r2907 62 62 void magazineReloaded(); 63 63 64 //XMLPort functions 64 65 virtual void setMunitionType(std::string munitionType); 65 66 virtual const std::string getMunitionType(); … … 68 69 virtual void setMagazineLoadingTime(float loadingTime); 69 70 virtual const float getMagazineLoadingTime(); 71 virtual void setBulletAmount(unsigned int amount); 72 virtual const unsigned int getBulletAmount(); 73 virtual void setMagazineAmount(unsigned int amount); 74 virtual const unsigned int getMagazineAmount(); 75 virtual void setUnlimitedMunition(bool unlimitedMunition); 76 virtual const bool getUnlimitedMunition(); 70 77 78 //weapon actions 71 79 virtual void takeBullets(); 72 80 virtual void takeMagazines(); 73 81 virtual void createProjectile(); 82 virtual void reloadBullet(); 83 virtual void reloadMagazine(); 74 84 85 //manually set or reset 86 virtual void setWeapon(); 87 virtual void setMunition(); 88 75 89 inline void setParentWeaponSystem(WeaponSystem *parentWeaponSystem) 76 90 { this->parentWeaponSystem_=parentWeaponSystem; }; … … 83 97 { return this->attachedToWeaponSlot_; } 84 98 85 virtual void setWeapon();86 99 87 100 private: … … 91 104 bool bulletReadyToShoot_; 92 105 bool magazineReadyToShoot_; 106 bool unlimitedMunition_; 93 107 float bulletLoadingTime_; 94 108 float magazineLoadingTime_; 109 unsigned int bulletAmount_; 110 unsigned int magazineAmount_; 95 111 std::string munitionType_; 96 112
Note: See TracChangeset
for help on using the changeset viewer.