Changeset 6669 in orxonox.OLD

Timestamp:

Jan 24, 2006, 2:26:15 PM (18 years ago)

Author:

bensch

Message:

some WeaponManager remake

Location:

trunk/src

Files:

• lib/util/count_pointer.h (added)
• world_entities/playable.cc (modified) (1 diff)
• world_entities/weapons/ammo_container.cc (modified) (1 diff)
• world_entities/weapons/ammo_container.h (modified) (1 diff)
• world_entities/weapons/weapon.h (modified) (4 diffs)
• world_entities/weapons/weapon_manager.cc (modified) (4 diffs)
• world_entities/weapons/weapon_manager.h (modified) (5 diffs)

trunk/src/world_entities/playable.cc

@@ -52 +52 @@
 void Playable::addWeapon(Weapon* weapon, int configID, int slotID)
 {
-  this->weaponMan->addWeapon(weapon, configID, slotID);
+  this->weaponMan->addWeapon(weapon);
 
   this->weaponConfigChanged();

trunk/src/world_entities/weapons/ammo_container.cc

@@ -32 +32 @@
    this->setClassID(CL_AMMO_CONTAINER, "AmmoContainer");
 
-
+   this->energy = 0.0;
+   this->maxEnergy = maxEnergy;
 }
 

trunk/src/world_entities/weapons/ammo_container.h

@@ -22 +22 @@
   virtual ~AmmoContainer();
 
+  bool operator=(ClassID projectileType) const { return (this->projectileType == projectileType); };
   ClassID getProjectileType() const { return this->projectileType; };
-
 
   float increaseEnergy(float energy);

trunk/src/world_entities/weapons/weapon.h

@@ -16 +16 @@
 
 #include "world_entity.h"
+#include "count_pointer.h"
+#include "ammo_container.h"
 
 // FORWARD DECLARATION
@@ -105 +107 @@
     inline void setCapability(long capabilities) { this->capability = capabilities; };
     /** @returns the Capabilities of this Weapon */
-    inline long getCapability() { return this->capability; };
+    inline long getCapability() const { return this->capability; };
     void setProjectileType(ClassID projectile);
     void setProjectileType(const char* projectile);
@@ -139 +141 @@
     inline float getLoadedEnergyMax() const { return this->energyLoadedMax; };
     inline float getEnergyMax() const { return this->energyMax; };
+    inline void setAmmoContainer(const CountPointer<AmmoContainer>& ammoContainer) { this->ammoContainer = ammoContainer;}
     inline float getEnergy() const { return this->energy; };
     inline float getLoadedEnergy() const { return this->energyLoaded; };
@@ -200 +203 @@
     float                energy;                           //!< The energy stored in the weapons secondary buffers (reserve)
     float                energyLoaded;                     //!< The energy stored in the weapons primary buffers (fire without reload)
+    CountPointer<AmmoContainer> ammoContainer;             //!< Pointer to the AmmoContainer this weapon grabs Energy from.
     float                energyMax;                        //!< The maximal energy that can be stored in the secondary buffers (reserveMax)
     float                energyLoadedMax;                  //!< The maximal energy that can be stored in the primary buffers

trunk/src/world_entities/weapons/weapon_manager.cc

@@ -203 +203 @@
 }
 
+
+bool WeaponManager::addWeapon(Weapon* weapon)
+{
+  int weaponConf = this->currentConfigID;
+  int slot;
+  if (slot = this->getNextFreeSlot(weaponConf, weapon->getCapability()) == -1 )
+    this->addWeapon(weapon, weaponConf, slot);
+}
 
 /**
@@ -246 +254 @@
   //! @todo check if the weapon is already assigned to another config in another slot
   this->configs[configID][slotID] = weapon;
+  weapon->setAmmoContainer(this->getAmmoContainer(weapon->getProjectileType()));
   if (this->parent != NULL)
   {
@@ -420 +429 @@
 /**
  * private gets the next free slot in a certain weaponconfig
- * @param the selected weaponconfig
+ * @param the selected weaponconfig -1 if none found
  */
 int WeaponManager::getNextFreeSlot(int configID, long capability)
@@ -434 +443 @@
 }
 
+CountPointer<AmmoContainer>& WeaponManager::getAmmoContainer(ClassID projectileType)
+{
+  for (unsigned int i = 0; i < this->ammo.size(); i++)
+  {
+    if (this->ammo[i]->getProjectileType() == projectileType)
+      return this->ammo[i];
+  }
+  this->ammo.push_back(CountPointer<AmmoContainer>(new AmmoContainer(projectileType)));
+  return this->ammo.back();
+}
 
 

trunk/src/world_entities/weapons/weapon_manager.h

@@ -17 +17 @@
 #include "crosshair.h"
 #include "weapon.h"
+
+#include "count_pointer.h"
+#include "ammo_container.h"
 
 // FORWARD DECLARATION
@@ -72 +75 @@
 
     bool addWeapon(Weapon* weapon);
-    bool addWeapon(Weapon* weapon, int configID = -1, int slotID = -1);
+    bool addWeapon(Weapon* weapon, int configID, int slotID = -1);
     void removeWeapon(Weapon* weapon, int configID = -1);
+
     Weapon* getWeapon(int slotID) const { return (slotID >= 0 && slotID < this->slotCount)? this->currentSlotConfig[slotID].nextWeapon: NULL; };
 
@@ -82 +86 @@
     void previousWeaponConfig();
     void changeWeaponConfig(int weaponConfig);
+
+    float addAmmunition(ClassID projectileType, float ammo);
+
 
     /** @returns a fixed target namely the Crosshair's 3D position */
@@ -97 +104 @@
  // private:
     int getNextFreeSlot(int configID, long capability = WTYPE_ALL);
+    CountPointer<AmmoContainer>& getAmmoContainer(ClassID projectileType);
 
   private:
@@ -112 +120 @@
     Crosshair*              crosshair;                                //!< an aim.
     tAnimation<Crosshair>*  crossHairSizeAnim;                        //!< An animation for the crosshair (scaling)
+
+    std::vector<CountPointer<AmmoContainer> > ammo;                   //!< Containers
 };