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

Timestamp:

Nov 23, 2005, 9:41:24 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: removed WeaponManager from all the Weapons, because weapon should not know where it is connected to

File:

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

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

@@ -81 +81 @@
   public:
     // INITIALISATION //
-    Weapon (WeaponManager* weaponManager = NULL);
+    Weapon ();
     virtual ~Weapon ();
 
@@ -92 +92 @@
     float increaseEnergy(float energyToAdd);
     ///////////////////
-
-    /** @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)*/
@@ -220 +215 @@
     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.
   };