Changeset 2379 for code/branches/weapon2/src/orxonox/objects/weaponSystem/Weapon.h

Timestamp:

Dec 10, 2008, 2:38:33 PM (15 years ago)

Author:

polakma

Message:

changed Weapon::fire and munition reloading

File:

• code/branches/weapon2/src/orxonox/objects/weaponSystem/Weapon.h (modified) (4 diffs)

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

@@ -55 +55 @@
 
             //reloading
-            void bulletTimer();
-            void magazineTimer();
+            void bulletTimer(float bulletLoadingTime);
+            void magazineTimer(float magazineLoadingTime);
             void bulletReloaded();
             void magazineReloaded();
@@ -63 +63 @@
             void setMagazineLoadingTime(float loadingTime);
             float getMagazineLoadingTime();
-            void setBulletReadyToShoot(bool b);
-            bool getBulletReadyToShoot();
-            void setMagazineReadyToShoot(bool b);
-            bool getMagazineReadyToShoot();
             Timer<Weapon> *getBulletTimer();
             Timer<Weapon> *getMagazineTimer();
@@ -72 +68 @@
             virtual void setMunitionType(std::string munitionType);
             virtual const std::string getMunitionType();
+
+            virtual void takeBullets();
+            virtual void takeMagazines();
+            virtual void createProjectile();
 
             inline void setParentWeaponSlot(WeaponSlot *parentWeaponSlot)
@@ -81 +81 @@
             inline WeaponSystem * getParentWeaponSystem()
                 { return this->parentWeaponSystem_; };
+
+            //in future by XMLPort, 
+            virtual void setWeapon();
 
         private: