Changeset 4906 in orxonox.OLD for orxonox/trunk/src/world_entities/weapons/weapon.h

Timestamp:

Jul 20, 2005, 1:41:19 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: states are now flow'n through

File:

• orxonox/trunk/src/world_entities/weapons/weapon.h (modified) (3 diffs)

orxonox/trunk/src/world_entities/weapons/weapon.h

@@ -81 +81 @@
     float increaseEnergy(float energyToAdd);
 
-    /** @returns true if the Weapon is Active */
-    inline bool isActive() const { return this->active; };
+    /** @returns true if the Weapon is Active  (this is used to check if the weapon must be drawn)*/
+    inline bool isActive() const { return (this->currentState == WS_INACTIVE)?false:true; };
+    /** @returns true if the weapon must be drawn */
+    inline bool isVisible() const { return (this->currentState != WS_INACTIVE || !this->hideInactive)?true:false; };
 
     // FUNCTIONS TO SET THE WEAPONS PROPERTIES.
@@ -113 +115 @@
 
     Animation3D* getAnimation(WeaponState state, PNode* node = NULL);
+    Animation3D* copyAnimation(WeaponState from, WeaponState to);
 
     // FLOW
-    virtual void tick(float dt);
+    void tickW(float dt); //!< this is a function that must be called by the weaponManager, or any other weaponHandler, all other functions are handled from within
+    virtual void tick(float dt) {};
     virtual void draw();
 
@@ -175 +179 @@
     PNode                emissionPoint;                   //!< The point, where the projectiles are emitted. (this is coppled with the Weapon by default)
 
-    bool                 active;                          //!< states wheter the weapon is enabled or not
     bool                 hideInactive;                    //!< Hides the Weapon if it is inactive
     bool                 chargeable;                      //!< if the Weapon is charcheable