Changeset 2908 for code/branches/questsystem5/src/orxonox/objects/weaponSystem/Weapon.h

Timestamp:

Apr 8, 2009, 12:58:47 AM (16 years ago)

Author:

dafrick

Message:

Reverted to revision 2906 (because I'm too stupid to merge correctly, 2nd try will follow shortly. )

Location:

code/branches/questsystem5

Files:

• . (modified) (1 prop)
• src/orxonox/objects/weaponSystem/Weapon.h (modified) (4 diffs)

code/branches/questsystem5/src/orxonox/objects/weaponSystem/Weapon.h

@@ -62 +62 @@
             void magazineReloaded();
 
-            //XMLPort functions
             virtual void setMunitionType(std::string munitionType);
             virtual const std::string getMunitionType();
@@ -69 +68 @@
             virtual void setMagazineLoadingTime(float loadingTime);
             virtual const float getMagazineLoadingTime();
-            virtual void setBulletAmount(unsigned int amount);
-            virtual const unsigned int getBulletAmount();
-            virtual void setMagazineAmount(unsigned int amount);
-            virtual const unsigned int getMagazineAmount();
-            virtual void setUnlimitedMunition(bool unlimitedMunition);
-            virtual const bool getUnlimitedMunition();
 
-            //weapon actions
             virtual void takeBullets();
             virtual void takeMagazines();
             virtual void createProjectile();
-            virtual void reloadBullet();
-            virtual void reloadMagazine();
 
-            //manually set or reset
-            virtual void setWeapon();
-            virtual void setMunition();
-            
             inline void setParentWeaponSystem(WeaponSystem *parentWeaponSystem)
                 { this->parentWeaponSystem_=parentWeaponSystem; };
@@ -97 +83 @@
                 { return this->attachedToWeaponSlot_; }
 
+            virtual void setWeapon();
 
         private:
@@ -104 +91 @@
             bool bulletReadyToShoot_;
             bool magazineReadyToShoot_;
-            bool unlimitedMunition_;
             float bulletLoadingTime_;
             float magazineLoadingTime_;
-            unsigned int bulletAmount_;
-            unsigned int magazineAmount_;
             std::string munitionType_;