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

Timestamp:

Nov 26, 2008, 2:17:18 PM (15 years ago)

Author:

polakma

Message:

pojectile compiles.

File:

• code/branches/weapon2/src/orxonox/objects/weaponSystem/Weapon.h (modified) (1 diff)

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

@@ -51 +51 @@
 
             virtual void fire();
+            void attachNeededMunition(std::string munitionType);
+            virtual void setParentWeaponSystem();
+            Munition * getAttachedMunition();
+
+            //reloading
             void bulletTimer();
             void magazineTimer();
             void bulletReloaded();
             void magazineReloaded();
-            void attachNeededMunition(std::string munitionType);
-
-            //get and set functions
-            virtual void setParentWeaponSystem();
-            Munition * getAttachedMunition();
             void setBulletLoadingTime(float loadingTime);
             float getBulletLoadingTime();