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

Timestamp:

Aug 22, 2006, 1:16:23 PM (18 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 :/

Location:

branches/new_class_id/src/world_entities/weapons

Files:

• ammo_container.h (modified) (2 diffs)
• weapon.h (modified) (3 diffs)
• weapon_manager.h (modified) (2 diffs)

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

@@ -19 +19 @@
 
  public:
-  AmmoContainer(ClassID projectileType, float maxEnergy = DEFAULT_MAX_ENERGY);
+  AmmoContainer(NewClassID id, float maxEnergy = DEFAULT_MAX_ENERGY);
   virtual ~AmmoContainer();
 
   bool operator=(int projectileType) const { return (this->projectileType == projectileType); };
-  ClassID getProjectileType() const { return this->projectileType; };
+  NewClassID getProjectileType() const { return this->projectileType; };
 
   float increaseEnergy(float energy);
@@ -41 +41 @@
    float  maxEnergy;
 
-   ClassID projectileType;
+   NewClassID projectileType;
 };
 

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.
   };

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

@@ -89 +89 @@
     void changeWeaponConfig(int weaponConfig);
 
-    float increaseAmmunition(ClassID projectileType, float ammo);
+    float increaseAmmunition(NewClassID projectileType, float ammo);
     float inclreaseAmmunition(const Weapon* weapon, float ammo);
 
@@ -106 +106 @@
  // private:
     int getNextFreeSlot(int configID, long capability = WTYPE_ALL);
-    CountPointer<AmmoContainer>& getAmmoContainer(ClassID projectileType);
+    CountPointer<AmmoContainer>& getAmmoContainer(NewClassID projectileType);
     CountPointer<AmmoContainer>& getAmmoContainer(const Weapon* weapon);