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

Timestamp:

Jul 23, 2005, 11:17:27 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: ProjectileFactory now handled in Weapon-class

File:

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

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

@@ -20 +20 @@
 
 #include "world_entity.h"
+#include "fast_factory.h"
 
 // FORWARD DECLARATION
@@ -79 +80 @@
     ////////////////////
 
+    // INTERACTIVITY //
     void requestAction(WeaponAction action);
     float increaseEnergy(float energyToAdd);
+    ///////////////////
+
 
     /** @returns true if the Weapon is Active  (this is used to check if the weapon must be drawn)*/
@@ -88 +92 @@
 
     // FUNCTIONS TO SET THE WEAPONS PROPERTIES.
-    /** @param projectile a projectile for this weapon */
-    void setProjectile(Projectile* projectile) { this->projectile = projectile; };
-    /** @returns The projectile if availiable */
-    Projectile* getProjectile() { return this->projectile; };
+    bool setProjectile(ClassID projectile);
+    /** @returns The projectile's classID */
+    inline ClassID getProjectile() { return this->projectile; };
+    /** @returns the FastFactory, that creates Projectiles of type getProjectile */
+    inline FastFactory* getProjectileFactory() { return this->projectileFactory; };
+
 
     void setEmissionPoint(const Vector& point);
@@ -188 +194 @@
     bool                 chargeable;                      //!< if the Weapon is charcheable (if true, the weapon will charge before it fires.)
 
-    Projectile*          projectile;                      //!< the projectile used for this weapon
+    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.
   };