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

Timestamp:

Sep 1, 2006, 8:06:39 PM (19 years ago)

Author:

bensch

Message:

renamed newclassid to classid and newobjectlist to objectlist

File:

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

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

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