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

Timestamp:

Nov 24, 2005, 12:13:22 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the WorldEntities into the Trunk.
Merged with command:
svn merge branches/world_entities/ trunk/ -r5516:HEAD

conflics from world_entities changed in favor of branches/world_entity
all other conflict in favor of the trunk

File:

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

trunk/src/world_entities/weapons/weapon.h

@@ -81 +81 @@
   public:
     // INITIALISATION //
-    Weapon (WeaponManager* weaponManager = NULL);
+    Weapon ();
     virtual ~Weapon ();
 
@@ -93 +93 @@
     ///////////////////
 
-    /** @param weaponManager sets the WeaponManager for this Weapon (NULL if free)) */
-    inline void setWeaponManager(WeaponManager* weaponManager) { this->weaponManager = weaponManager; };
-    /** @returns the WeaponManager of this Weapon (or NULL if it is free) */
-    inline WeaponManager* getWeaponManager() const { return this->weaponManager; };
-
     /** @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; };
+    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; };
+    inline bool isVisible() const { return (this->currentState != WS_INACTIVE || !this->hideInactive) ? true : false; };
     /** @returns true if the Weapon is chargeable */
     inline bool isChargeable() const { return this->chargeable; };
@@ -120 +115 @@
 
 
+    // EMISSION
     void setEmissionPoint(const Vector& point);
     /** @see void setEmissionPoint(const Vector& point); */
@@ -126 +122 @@
     inline const Vector& getEmissionPoint() const { return this->emissionPoint.getAbsCoor(); };
 
+    // STATE CHANGES //
     /** @param state the State to time @param duration the duration of the State */
     inline void setStateDuration(const char* state, float duration) { setStateDuration(charToState(state), duration); };
@@ -131 +128 @@
     inline void setStateDuration(WeaponState state, float duration) { /*(state < WS_STATE_COUNT)?*/this->times[state] = duration; };
     /** @param state The state to query @returns the Time the queried State takes to complete */
-    inline float getStateDuration(WeaponState state) const { return (state < WS_STATE_COUNT)?this->times[state]:0.0; };
+    inline float getStateDuration(WeaponState state) const { return (state < WS_STATE_COUNT)? this->times[state] : 0.0; };
     /** @returns true if the time of the currentState is elapsed, false otherwise */
-    inline bool stateTimeElapsed() const { return (this->stateDuration > this->times[currentState])?true:false; };
+    inline bool stateTimeElapsed() const { return (this->stateDuration > this->times[currentState])? true : false; };
     /** @returns the current State of the Weapon */
     inline WeaponState getCurrentState() const { return this->currentState; };
@@ -149 +146 @@
     // FLOW
     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() const;
@@ -194 +192 @@
     // it is all about energy
     float                energy;                           //!< The energy stored in the weapons secondary buffers (reserve)
-    float                energyLoaded;                     //!< The energy stored in the weapons primary buffers (firewithout reload)
+    float                energyLoaded;                     //!< The energy stored in the weapons primary buffers (fire without reload)
     float                energyMax;                        //!< The maximal energy that can be stored in the secondary buffers (reserveMax)
     float                energyLoadedMax;                  //!< The maximal energy that can be stored in the primary buffers
@@ -220 +218 @@
     ClassID              projectile;                      //!< the projectile used for this weapon (since they should be generated via macro and the FastFactory, only the ClassID must be known.)
     FastFactory*         projectileFactory;               //!< A factory, that produces and handles the projectiles.
-
-    WeaponManager*       weaponManager;                   //!< The weaponManager this weapon is connected to. if NULL it is assumed, that the weapon is freely connected to an entity without a binding WeaponManager.
   };