Changeset 4884 in orxonox.OLD for orxonox/branches/weaponSystem/src/world_entities/weapons/weapon.h

Timestamp:

Jul 18, 2005, 3:26:03 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: saver implementation of state-variables.
this step makes the execute function very big, and as such is not the best idea, maybe i will split up the checks in the execute-functions so one has a better insight into what is happening in weapon.
For this maybe a wrapper around fire/reload… functions will be written, that calls them within a fireWeapon/reloadWeapon function

File:

• orxonox/branches/weaponSystem/src/world_entities/weapons/weapon.h (modified) (2 diffs)

orxonox/branches/weaponSystem/src/world_entities/weapons/weapon.h

@@ -147 +147 @@
     // PHASES //
     ////////////
+  private:
     WeaponState          currentState;                     //!< The State the weapon is in.
     WeaponAction         requestedAction;                  //!< An action to try to Engage after the currentState ends.
@@ -157 +158 @@
     bool                 hideInactive;                    //!< Hides the Weapon if it is inactive
 
-  private:
     bool                 active;                          //!< states wheter the weapon is enabled or not
     Projectile*          projectile;                      //!< the projectile used for this weapon