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

Timestamp:

Aug 22, 2006, 1:16:23 PM (19 years ago)

Author:

bensch

Message:

adapted many classes to the new ClassID System, now comes the hard part… Scripting… then Network… wow this will be so bad :/

File:

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

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

@@ -87 +87 @@
     Weapon ();
     virtual ~Weapon ();
-    static Weapon* createWeapon(ClassID weaponID);
+    static Weapon* createWeapon(NewClassID weaponID);
 
     void init();
@@ -110 +110 @@
     /** @returns the Capabilities of this Weapon */
     inline long getCapability() const { return this->capability; };
-    void setProjectileType(ClassID projectile);
+    void setProjectileType(NewClassID projectile);
     void setProjectileTypeC(const std::string& projectile);
     /** @returns The projectile's classID */
-    inline ClassID getProjectileType() { return this->projectile; };
+    inline NewClassID getProjectileType() { return this->projectile; };
     /** @returns the FastFactory, that creates Projectiles of type getProjectile */
     inline FastFactory* getProjectileFactory() { return this->projectileFactory; };
@@ -230 +230 @@
     bool                   chargeable;                      //!< if the Weapon is charcheable (if true, the weapon will charge before it fires.)
 
-    ClassID                projectile;                      //!< the projectile used for this weapon (since they should be generated via macro and the FastFactory, only the ClassID must be known.)
+    NewClassID                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.
   };