Changeset 267

Timestamp:

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

Author:

rgrieder

Message:

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

Location:

code/branches/main_reto

Files:

• bin/CMakeCache.txt (added)
• src/CMakeLists.txt (modified) (2 diffs)
• src/main.cc (modified) (3 diffs)
• src/orxonox_prerequisites.h (modified) (1 diff)
• src/orxonox_scene.cc (modified) (2 diffs)
• src/orxonox_ship.cc (modified) (5 diffs)
• src/orxonox_ship.h (modified) (3 diffs)
• src/run_manager.cc (modified) (19 diffs)
• src/run_manager.h (modified) (5 diffs)
• src/weapon/CMakeLists.txt (modified) (1 diff)
• src/weapon/ammunition_dump.cc (modified) (3 diffs)
• src/weapon/ammunition_dump.h (modified) (1 diff)
• src/weapon/barrel_gun.cc (added)
• src/weapon/barrel_gun.h (added)
• src/weapon/base_weapon.cc (added)
• src/weapon/base_weapon.h (added)
• src/weapon/weapon.h (deleted)
• src/weapon/weapon_manager.cc (deleted)
• src/weapon/weapon_manager.h (deleted)
• src/weapon/weapon_station.cc (added)
• src/weapon/weapon_station.h (added)

code/branches/main_reto/src/CMakeLists.txt

@@ -2 +2 @@
 
 # create a few variables to simplify life
-SET(SRC_FILES
-        orxonox.cc
-        main.cc
+SET( ORXONOX_SRC
         camera_manager.cc
         inertial_node.cc
+        main.cc
         ogre_control.cc
+        orxonox.cc
         orxonox_scene.cc
         orxonox_ship.cc
-        run_manager.cc)
+        run_manager.cc
 
-SET(INC_FILES
         camera_manager.h
         inertial_node.h
@@ -20 +19 @@
         orxonox_scene.h
         orxonox_ship.h
-        run_manager.h)
+        run_manager.h
+   )
 
 #Creates an executable
-ADD_EXECUTABLE(../bin/main ${SRC_FILES, weapon/WPN_CC_FILES} ${INC_FILES, weapon/WPN_H_FILES})
-#Links the executable against OGRE and OIS
-TARGET_LINK_LIBRARIES(../bin/main ${OGRE_LIBRARIES} ${OIS_LIBRARIES} ${CEGUI_LIBRARIES} ${CEGUI_OGRE_LIBRARIES})
+ADD_EXECUTABLE(../bin/main ${ORXONOX_SRC} )
 
 #add weapon source dir
-ADD_SUBDIRECTORY(weapon)
+#ADD_SUBDIRECTORY(weapon)
+
+#Links the executable against OGRE and OIS
+TARGET_LINK_LIBRARIES(../bin/main WEAPON ${OGRE_LIBRARIES} ${OIS_LIBRARIES} ${CEGUI_LIBRARIES} ${CEGUI_OGRE_LIBRARIES})
+#TARGET_LINK_LIBRARIES(../bin/main ${OGRE_LIBRARIES} ${OIS_LIBRARIES} ${CEGUI_LIBRARIES} ${CEGUI_OGRE_LIBRARIES})

code/branches/main_reto/src/main.cc

@@ -31 +31 @@
 #include "orxonox.h"
 
+#include "class_hierarchy/BaseObject.h"
+#include "class_hierarchy/Test.h"
+#include "class_hierarchy/test1.h"
+#include "class_hierarchy/test2.h"
+#include "class_hierarchy/test3.h"
+
+
 #ifdef __cplusplus
 extern "C" {
@@ -43 +50 @@
 #endif 
   {
+#if 1
     try {
       // create an orxonox application and run it
@@ -60 +68 @@
     }
 
+#else
+#define testandcout(code) \
+    std::cout << #code << " " << code << "\n"
+
+    using namespace orxonox;
+
+    std::cout << "Test 8\n";
+
+    std::cout << "1\n";
+    Test1* test8_01 = new Test1;
+    Test1* asdf = new Test1;
+    Test3* test8_03 = new Test3;
+    test8_03->usefullClassesIsATest(test8_01);
+
+    std::cout << "2\n";
+    Test2* test8_02 = new Test2;
+    test8_03->usefullClassesIsATest(test8_02);
+
+    std::cout << "3\n";
+    test8_01->setUsefullClass1(Class(Test1));
+    test8_01->setUsefullClass1(test8_02->getIdentifier());
+    test8_01->setUsefullClass2(Class(Test2));
+    test8_01->setUsefullClassOfTypeTest3(Class(Test3));
+    test8_01->setUsefullClassOfTypeTest3(test8_03->getIdentifier());
+
+
+    testandcout(test8_01->isA(Class(Test1)));
+    testandcout(test8_01->isA(Class(Test2)));
+    testandcout(test8_01->isA(Class(Test3)));
+
+    Test2* test8_04 = new Test2;
+    testandcout(test8_02->isA(Class(Test1)));
+    testandcout(test8_02->isA(Class(Test2)));
+    testandcout(test8_02->isA(Class(Test3)));
+
+    Test3* test8_05 = new Test3;
+    testandcout(test8_03->isA(Class(Test1)));
+    testandcout(test8_03->isA(Class(Test2)));
+    testandcout(test8_03->isA(Class(Test3)));
+
+    delete test8_01;
+    delete test8_02;
+    delete test8_03;
+
+#endif
     return 0;
   }

code/branches/main_reto/src/orxonox_prerequisites.h

@@ -46 +46 @@
     class Bullet;
     class BulletManager;
-    class Weapon;
-    class WeaponManager;
+    class BaseWeapon;
+    class BarrelGun;
+    class WeaponStation;
+
+  }
+
+
+  namespace hud {
+    
+    class HUDOverlay;
 
   }

code/branches/main_reto/src/orxonox_scene.cc

@@ -98 +98 @@
   void OrxonoxScene::createScene()
   {
-          sceneMgr_->setAmbientLight(ColourValue(0.3,0.3,0.3));
+          sceneMgr_->setAmbientLight(ColourValue(0.3,0.3,0.3)*2);
 
           //create first entity
@@ -110 +110 @@
 
           // set up skybox
-          sceneMgr_->setSkyBox(true, "Examples/SceneSkyBox2");
+          sceneMgr_->setSkyBox(true, "Examples/SceneSkyBox1");
 
           // set up one light_ source

code/branches/main_reto/src/orxonox_ship.cc

@@ -26 +26 @@
  */
 
-#include "OgreSceneManager.h"
+#include "OgreMath.h"
+#include "OgreVector3.h"
+#include "OgreQuaternion.h"
 #include "OgreSceneNode.h"
 #include "OgreEntity.h"
-#include "OgreVector3.h"
-#include "OgreStringConverter.h"
+#include "OgreSceneManager.h"
+#include "OgreParticleSystem.h"
 
 #include "inertial_node.h"
+#include "run_manager.h"
 #include "weapon/bullet.h"
 #include "weapon/bullet_manager.h"
-#include "weapon/weapon_manager.h"
+#include "weapon/weapon_station.h"
+#include "weapon/base_weapon.h"
+#include "weapon/barrel_gun.h"
+#include "weapon/ammunition_dump.h"
 
 #include "orxonox_ship.h"
@@ -65 +71 @@
   * @param mNode The scene node which the ship will be attached to later.
   */
-  OrxonoxShip::OrxonoxShip(SceneManager *sceneMgr, SceneNode *node,
-        BulletManager *bulletManager)
-              : sceneMgr_(sceneMgr), //currentSpeed_(Vector3(0, 0, 0)),
-        baseThrust_(1000), currentThrust_(Vector3::ZERO),
-        objectCounter_(0), bulletManager_(bulletManager)//, bulletSpeed_(400)
+  OrxonoxShip::OrxonoxShip(SceneNode *node)
+    : sceneMgr_(RunManager::getSingletonPtr()->getSceneManagerPtr()),
+      bulletManager_(RunManager::getSingletonPtr()->getBulletManagerPtr()),
+      baseThrust_(1000), currentThrust_(Vector3::ZERO), objectCounter_(0)
   {
     rootNode_ = new InertialNode(node, Vector3::ZERO);
@@ -83 +88 @@
     if (mainWeapon_)
       delete mainWeapon_;
+    if (railGunStation_)
+      delete railGunStation_;
     if (rootNode_)
       delete rootNode_;
@@ -110 +117 @@
 
     // initialise weapon(s)
+    ammoDump_ = new AmmunitionDump();
+    ammoDump_->setDumpSize("Barrel", 1000);
+    ammoDump_->store("Barrel", 420);
+
     InertialNode *mainWeaponNode = rootNode_->createChildNode();
-    mainWeapon_ = new WeaponManager(sceneMgr_, mainWeaponNode,
-          bulletManager_, 1);
-    mainWeapon_->addWeapon("Barrel Gun");
+    mainWeapon_ = new BarrelGun(mainWeaponNode, ammoDump_);
+
+    railGunStation_ = new WeaponStation(4);
+    railGunStation_->addWeapon(mainWeapon_);
+    railGunStation_->selectWeapon(0);
+
+    // create some nice effects
+
+    ParticleSystem *particles = RunManager::getSingletonPtr()
+      ->getSceneManagerPtr()->createParticleSystem("asdf", "Examples/Smoke");
+
+    fishNode->getSceneNode()->attachObject(particles);
+
+
+
 
           return true;
@@ -197 +220 @@
   * @return Bullet containing speed and entity.
   */
-  void OrxonoxShip::fire()
-  {
-    mainWeapon_->primaryFireRequest();
+  BaseWeapon* OrxonoxShip::getMainWeapon()
+  {
+    return mainWeapon_;
+  }
+
+
+  int OrxonoxShip::getAmmoStock()
+  {
+    return ammoDump_->getStockSize("Barrel");
   }
 

code/branches/main_reto/src/orxonox_ship.h

@@ -40 +40 @@
   {
   public:
-    OrxonoxShip(Ogre::SceneManager*, Ogre::SceneNode*, weapon::BulletManager*);
+    OrxonoxShip(Ogre::SceneNode*);
           virtual ~OrxonoxShip();
 
@@ -54 +54 @@
     Ogre::Vector3 getSpeed();
 
-          void fire();
+    weapon::BaseWeapon* getMainWeapon();
+
+    int getAmmoStock();
 
           bool tick(unsigned long, Ogre::Real);
@@ -74 +76 @@
           //Ogre::Vector3 bulletSpeed_;
 
-    weapon::WeaponManager *mainWeapon_;
+    weapon::BaseWeapon *mainWeapon_;
+    weapon::WeaponStation *railGunStation_;
+
+    weapon::AmmunitionDump *ammoDump_;
   };
 

code/branches/main_reto/src/run_manager.cc

@@ -56 +56 @@
 #include "weapon/bullet.h"
 #include "weapon/bullet_manager.h"
-#include "weapon/weapon_manager.h"
+#include "weapon/base_weapon.h"
+
+#include "hud/hud_overlay.h"
 
 #include "run_manager.h"
+
+namespace Ogre {
+  using namespace orxonox;
+  template<> RunManager* Singleton<RunManager>::ms_Singleton = 0;
+}
 
 namespace orxonox {
   using namespace Ogre;
   using namespace weapon;
+  using namespace hud;
 
   /**
@@ -77 +85 @@
   */
 
+  RunManager* RunManager::getSingletonPtr(void)
+  {
+      return ms_Singleton;
+  }
+  RunManager& RunManager::getSingleton(void)
+  {  
+      assert( ms_Singleton );  return ( *ms_Singleton );  
+  }
+
 
   /**
@@ -88 +105 @@
   */
   RunManager::RunManager(OgreControl * ogre)
-        : ogre_(ogre), window_(ogre->getRenderWindow()), leftButtonDown_(false),
+        : ogre_(ogre), window_(ogre->getRenderWindow()), //leftButtonDown_(false),
         statsOn_(true), screenShotCounter_(0), timeUntilNextToggle_(0),
         filtering_(TFO_BILINEAR), aniso_(1), sceneDetailIndex_(0),
@@ -94 +111 @@
         debugOverlay_(0), inputManager_(0), mouse_(0), keyboard_(0), joystick_(0)
   {
-
     // SETTING UP THE SCENE
 
     // create one new SceneManger
-    sceneMgr_ = ogre_->getRoot()->createSceneManager(ST_GENERIC, "backgroundScene_");
+    sceneMgr_ = ogre_->getRoot()->createSceneManager(ST_GENERIC, "Orxonox Scene");
 
     // background scene (world objects, skybox, lights, etc.)
@@ -108 +124 @@
     // create a bullet manager
     bulletManager_ = new BulletManager(sceneMgr_);
-    WeaponManager::loadWeapons();
-
-    // TODO: Use STL to make life easier. But it works this way too..
-    /*bullets_ = new Bullet*[10];
-    bulletsIndex_ = 0;
-    bulletsSize_ = 10;*/
 
 
@@ -131 +141 @@
 
     // Construct a new spaceship and give it the node
-    playerShip_ = new OrxonoxShip(sceneMgr_, sceneMgr_->getRootSceneNode()
-      ->createChildSceneNode("ShipNode", Vector3(20, 20, 20)), bulletManager_);
+    playerShip_ = new OrxonoxShip(sceneMgr_->getRootSceneNode()
+      ->createChildSceneNode("ShipNode", Vector3(20, 20, 20)));
 
 
@@ -153 +163 @@
     createViewports();
 
+    // create HUD
+    hud_ = new HUDOverlay();
+    hud_->show();
+
 
     // Set default mipmap level (NB some APIs ignore this)
@@ -163 +177 @@
     using namespace OIS;
 
-    debugOverlay_ = OverlayManager::getSingleton()
-      .getByName("Core/DebugOverlay");
+    //debugOverlay_ = OverlayManager::getSingleton()
+    //  .getByName("Core/DebugOverlay");
+    
 
     LogManager::getSingletonPtr()->logMessage("*** Initializing OIS ***");
@@ -194 +209 @@
     windowResized(window_);
 
-    showDebugOverlay(true);
+    //showDebugOverlay(true);
 
     // REGISTER THIS OBJECT AS A WINDOW EVENT LISTENER IN OGRE
@@ -218 +233 @@
     if (bulletManager_)
       delete bulletManager_;
-
-    WeaponManager::destroyWeapons();
-
-    // clean up the bullet list
-    /*for (int i = 0; i < bulletsIndex_; i++)
-      delete bullets_[i];
-    delete bullets_;*/
   }
 
@@ -251 +259 @@
 
     // Update the 'HUD'
-    updateStats();
+    //updateStats();
 
     // update the bullet positions
     bulletManager_->tick(time, deltaTime);
 
-    /*for (int i = 0; i < bulletsIndex_; i++)
-    {
-      bullets_[i]->node_->translate(bullets_[i]->speed_*deltaTime);
-      bullets_[i]->node_->yaw(Degree(deltaTime*100));
-      bullets_[i]->node_->roll(Degree(deltaTime*300));
-    }*/
 
     // HUMAN INTERFACE
@@ -293 +295 @@
     // keep rendering
     return true;
+  }
+
+
+  SceneManager& RunManager::getSceneManager()
+  {
+    return *sceneMgr_;
+  }
+
+  SceneManager* RunManager::getSceneManagerPtr()
+  {
+    return sceneMgr_;
+  }
+
+  BulletManager* RunManager::getBulletManagerPtr()
+  {
+    return bulletManager_;
+  }
+
+  int RunManager::getAmmunitionID(const Ogre::String &ammoName)
+  {
+    Ogre::String ammoTypes[] = { "Energy Cell", "Barrel", "Lead Shot" };
+    int ammoTypesLength = 3;
+
+    for (int i = 0; i < ammoTypesLength; i++)
+    {
+      if (ammoTypes[i] == ammoName)
+        return i;
+    }
+    return -1;
+  }
+
+  int RunManager::getNumberOfAmmos()
+  {
+    return 3;
   }
 
@@ -367 +403 @@
       playerShip_->setYThrust(0);
 
+    if (keyboard_->isKeyDown(KC_G))
+      playerShip_->getMainWeapon()->addAction(BaseWeapon::RELOAD);
+
     if( keyboard_->isKeyDown(KC_ESCAPE) || keyboard_->isKeyDown(KC_Q) )
       return false;
@@ -373 +412 @@
     {
       statsOn_ = !statsOn_;
-      showDebugOverlay(statsOn_);
+      //showDebugOverlay(statsOn_);
       timeUntilNextToggle_ = 1;
     }
@@ -398 +437 @@
       MaterialManager::getSingleton().setDefaultAnisotropy(aniso_);
 
-      showDebugOverlay(statsOn_);
+      //showDebugOverlay(statsOn_);
       timeUntilNextToggle_ = 1;
     }
@@ -434 +473 @@
     if(displayCameraDetails)
       debugText_ = " | Speed = "
-            + StringConverter::toString(playerShip_->getSpeed());
+            + StringConverter::toString(playerShip_->getSpeed())
+            + " | Left Ammo = "
+            + StringConverter::toString(playerShip_
+            ->getMainWeapon()->getAmmoState())
+            + " | Ammo stock = "
+            + StringConverter::toString(playerShip_->getAmmoStock());
     // debugText_ = "P: " + StringConverter::toString(camera_
     //      ->getDerivedPosition()) + " " + "O: "
@@ -457 +501 @@
     const MouseState &ms = mouse_->getMouseState();
 
-    // This is a 'hack' to show some flying barrels..
-    // Usually, the Bullet created by the ship should be managed
-    // by the physics engine..
-    if (ms.buttonDown(MB_Left) && !leftButtonDown_)
-    {
-      // Prevent continuous fire for the moment.
-      leftButtonDown_ = true;
-
-      playerShip_->fire();
-      
-      // let ship fire one shot with its only weapon (Barrels..)
-      /*Bullet *tempBullet = playerShip_->fire();
-
-      // resize array if neccessary (double the size then)
-      if (bulletsIndex_ >= bulletsSize_)
-      {
-        // redimension the array
-        Bullet **tempArray = new Bullet*[2*bulletsSize_];
-        for (int i = 0; i < bulletsSize_; i++)
-          tempArray[i] = bullets_[i];
-        bulletsSize_ *= 2;
-        delete bullets_;
-        bullets_ = tempArray;
-      }
-
-      // add the bullet to the list
-      bullets_[bulletsIndex_++] = tempBullet;*/
-
-    }
-    else if (!ms.buttons)
-      leftButtonDown_ = false;
-
-    // space ship steering. This should definitely be done in the steering object
-    // Simply give it the mouse movements.
+    if (ms.buttonDown(MB_Left))
+      playerShip_->getMainWeapon()->primaryFireRequest();
+
+    if (ms.buttonDown(MB_Right))
+      playerShip_->getMainWeapon()->secondaryFireRequest();
+
     playerShip_->turnUpAndDown(Radian(ms.Y.rel * mouseSensitivity_));
     playerShip_->turnLeftAndRight(Radian(ms.X.rel * mouseSensitivity_));
-    //playerShip_->mRootNode->pitch(Degree(-ms.Y.rel * 0.13), Ogre::Node::TransformSpace::TS_LOCAL);
-    //playerShip_->mRootNode->yaw(Degree(-ms.X.rel * 0.13), Ogre::Node::TransformSpace::TS_PARENT);
 
     // keep rendering
@@ -565 +579 @@
 
 
-
   /**
   * Simple camera creator.
@@ -583 +596 @@
   /**
   * Simple viewport creator.
-  * TODO: fully understand the concept of viewports concerning orxnox.
-  * E.g. do we need splitscreen mode?
   * For now the viewport uses the entire render window and is based on the one
   * camera created so far.

code/branches/main_reto/src/run_manager.h

@@ -33 +33 @@
 #include "OgreWindowEventUtilities.h"
 #include "OgreTextureManager.h"
+#include "OgreSingleton.h"
 
 #include <OIS/OISPrereqs.h>
@@ -43 +44 @@
   // let the class inherit from WindowEventListener in order for the RunMgr
   // to act as the central point of all the calcuations in Orxonox
-  class RunManager : Ogre::WindowEventListener
+  class RunManager : public Ogre::WindowEventListener,
+                     public Ogre::Singleton<RunManager>
   {
   public:
-          RunManager(OgreControl*);
+    RunManager(OgreControl*);
 
-          virtual ~RunManager();
+    virtual ~RunManager();
+    //void initialise(OgreControl*);
 
-    virtual bool tick(unsigned long, Ogre::Real);
+    bool tick(unsigned long, Ogre::Real);
+
+    Ogre::SceneManager& getSceneManager();
+
+    Ogre::SceneManager* getSceneManagerPtr();
+
+    weapon::BulletManager* getBulletManagerPtr();
+
+    int getAmmunitionID(const Ogre::String&);
+
+    int getNumberOfAmmos();
+
+    static RunManager& getSingleton(void);
+
+    static RunManager* getSingletonPtr(void);
+
 
   protected:
-          virtual void createCamera(void);
+          void createCamera(void);
 
-          virtual void createViewports(void);
+          void createViewports(void);
 
 
@@ -61 +79 @@
 
           //Adjust mouse clipping area
-          virtual void windowResized(Ogre::RenderWindow*);
+          void windowResized(Ogre::RenderWindow*);
 
           //Unattach OIS before window shutdown (very important under Linux)
-          virtual void windowClosed(Ogre::RenderWindow*);
+          void windowClosed(Ogre::RenderWindow*);
 
 
           /** INPUT PROCESSING **/
-          virtual bool processUnbufferedKeyInput();
+          bool processUnbufferedKeyInput();
 
-          virtual bool processUnbufferedMouseInput();
+          bool processUnbufferedMouseInput();
 
 
           /** OUTPUT **/
 
-          virtual void updateStats(void);
+          void updateStats(void);
 
-          virtual void showDebugOverlay(bool);
+          void showDebugOverlay(bool);
 
   protected:
+    // directly Ogre related fields
           Ogre::SceneManager *sceneMgr_;
           Ogre::RenderWindow *window_;
           Ogre::Camera       *camera_;
+
+
+    // self made orxonox fields
           OgreControl  *ogre_;
           OrxonoxScene *backgroundScene_;
           OrxonoxShip  *playerShip_;
+    hud::HUDOverlay   *hud_;
 
+    // Bullet manager
+    weapon::BulletManager *bulletManager_;
+
+    const Ogre::Real mouseSensitivity_;
+
+          // previously elapsed render time
+          unsigned long totalTime_;
+
+
+    // fields from the example framework
           bool statsOn_;
           std::string debugText_;
@@ -93 +126 @@
           // just to stop toggles flipping too fast
           Ogre::Real timeUntilNextToggle_;
-          bool leftButtonDown_;
+          //bool leftButtonDown_;
           Ogre::TextureFilterOptions filtering_;
           int aniso_;
-
           int sceneDetailIndex_;
           Ogre::Overlay* debugOverlay_;
@@ -106 +138 @@
           OIS::JoyStick* joystick_;
 
-    const Ogre::Real mouseSensitivity_;
-
-    // Bullet array
-          /*Bullet **bullets_;
-          int bulletsSize_;
-          int bulletsIndex_;*/
-    weapon::BulletManager *bulletManager_;
-
-          // previously elapsed render time
-          unsigned long totalTime_;
-
   };
 

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: