Changeset 232 for code/branches/main_reto_vs05/src/weapon/ammunition_dump.cc

Timestamp:

Nov 21, 2007, 12:44:02 AM (16 years ago)

Author:

rgrieder

Message:

• modified the AmmunitionDump to hold different types of ammo
• converted the RunManager into a Singleton
• added some methods to address ammo by string
• created a BaseWeapon class
• derived BarrelGun from BaseWeapon

File:

• code/branches/main_reto_vs05/src/weapon/ammunition_dump.cc (modified) (3 diffs)

code/branches/main_reto_vs05/src/weapon/ammunition_dump.cc

@@ -26 +26 @@
  */
 
+#include "run_manager.h"
+
 #include "ammunition_dump.h"
 
@@ -32 +34 @@
 namespace weapon {
 
-  AmmunitionDump::AmmunitionDump(int capacity)
-        : stock_(0), capacity_(capacity)
+  AmmunitionDump::AmmunitionDump()
+    : numberOfAmmos_(RunManager::getSingletonPtr()->getNumberOfAmmos()),
+      stock_(new int[numberOfAmmos_]),
+      capacity_(new int[numberOfAmmos_])
   {
+    for (int i = 0; i < numberOfAmmos_; i++)
+    {
+      stock_[i] = 0;
+      capacity_[i] = 0;
+    }
   }
 
@@ -40 +49 @@
   AmmunitionDump::~AmmunitionDump()
   {
+    if (stock_)
+      delete stock_;
+    if (capacity_)
+      delete capacity_;
+  }
+
+  void AmmunitionDump::setDumpSize(const Ogre::String &name, int size)
+  {
+    if (size < 0)
+      return;
+    int id = RunManager::getSingletonPtr()->getAmmunitionID(name);
+    if (id == -1)
+      return;
+    capacity_[id] = size;
   }
 
   
-  void AmmunitionDump::store(int quantity)
+  int AmmunitionDump::store(const Ogre::String &name, int quantity)
   {
-    stock_ += quantity;
-    if (stock_ > capacity_)
-      stock_ = capacity_;
+    int id = RunManager::getSingletonPtr()->getAmmunitionID(name);
+    if (id == -1)
+      return quantity;
+    stock_[id] += quantity;
+    if (stock_[id] > capacity_[id])
+    {
+      quantity = capacity_[id] - stock_[id];
+      stock_[id] = capacity_[id];
+      return quantity;
+    }
+    else
+      return 0;
   }
 
 
-  int AmmunitionDump::getAmmunition(int quantity)
+  int AmmunitionDump::getAmmunition(const Ogre::String &name, int quantity)
   {
-    if (stock_ >= quantity)
-    {
-      stock_ -= quantity;
-      return quantity;
-    }
+    int id = RunManager::getSingletonPtr()->getAmmunitionID(name);
+    if (id == -1)
+      return 0;
+    if (stock_[id] >= quantity)
+      stock_[id] -= quantity;
     else
     {
-      quantity = stock_;
-      stock_ = 0;
-      return quantity;
+      quantity = stock_[id];
+      stock_[id] = 0;
     }
+    return quantity;
   }
 
 
-  int AmmunitionDump::getStockSize()
+  int AmmunitionDump::getStockSize(const Ogre::String &name)
   {
-    return stock_;
+    int id = RunManager::getSingletonPtr()->getAmmunitionID(name);
+    if (id = -1)
+      return -1;
+    return stock_[id];
   }
 }