Changeset 267 for code/branches/main_reto/src/weapon

Timestamp:

Nov 27, 2007, 3:02:03 PM (16 years ago)

Author:

rgrieder

Message:

• updated to current revision from Visual studio directory
• hopefully working libraries with cmake

Location:

code/branches/main_reto/src/weapon

Files:

• CMakeLists.txt (modified) (1 diff)
• ammunition_dump.cc (modified) (3 diffs)
• ammunition_dump.h (modified) (1 diff)
• barrel_gun.cc (added)
• barrel_gun.h (added)
• base_weapon.cc (added)
• base_weapon.h (added)
• weapon.h (deleted)
• weapon_manager.cc (deleted)
• weapon_manager.h (deleted)
• weapon_station.cc (added)
• weapon_station.h (added)

code/branches/main_reto/src/weapon/CMakeLists.txt

@@ -2 +2 @@
 
 # create a few variables to simplify life
-SET(WPN_CC_FILES
+SET( WEAPON_SRC
         ammunition_dump.cc
+        barrel_gun.cc
+        base_weapon.cc
         bullet.cc
         bullet_manager.cc
-        weapon_manager.cc)
-SET(WPN_H_FILES
+        weapon_station.cc
+
         ammunition_dump.h
+        barrel_gun.h
+        base_weapon.h
         bullet.h
         bullet_manager.h
-        weapon.h
-        weapon_manager.h)
+        weapon_station.h
+   )
 
+#ADD_LIBRARY(WEAPON ${WEAPON_SRC} )

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

@@ -26 +26 @@
  */
 
+#include "run_manager.h"
+
 #include "ammunition_dump.h"
 
@@ -33 +35 @@
 
   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;
+    }
   }
 
@@ -39 +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;
+  }
+
+  
+  int AmmunitionDump::store(const Ogre::String &name, int quantity)
+  {
+    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(const Ogre::String &name, int quantity)
+  {
+    int id = RunManager::getSingletonPtr()->getAmmunitionID(name);
+    if (id == -1)
+      return 0;
+    if (stock_[id] >= quantity)
+      stock_[id] -= quantity;
+    else
+    {
+      quantity = stock_[id];
+      stock_[id] = 0;
+    }
+    return quantity;
+  }
+
+
+  int AmmunitionDump::getStockSize(const Ogre::String &name)
+  {
+    int id = RunManager::getSingletonPtr()->getAmmunitionID(name);
+    if (id = -1)
+      return -1;
+    return stock_[id];
+  }
 }
 }

code/branches/main_reto/src/weapon/ammunition_dump.h

@@ -41 +41 @@
   {
   public:
-          AmmunitionDump();
+    AmmunitionDump();
           ~AmmunitionDump();
 
+    void setDumpSize(const Ogre::String &name, int size);
+
+    int store(const Ogre::String &name, int quantiy);
+
+    int getAmmunition(const Ogre::String &name, int quantity);
+
+    int getStockSize(const Ogre::String &name);
+
   protected:
+    int numberOfAmmos_;
+    int *stock_;
+    int *capacity_;
 
   protected: