Changeset 232 for code/branches/main_reto_vs05/src/orxonox_ship.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/orxonox_ship.cc (modified) (4 diffs)

code/branches/main_reto_vs05/src/orxonox_ship.cc

@@ -34 +34 @@
 
 #include "inertial_node.h"
+#include "run_manager.h"
 #include "weapon/bullet.h"
 #include "weapon/bullet_manager.h"
 #include "weapon/weapon_station.h"
 #include "weapon/base_weapon.h"
+#include "weapon/barrel_gun.h"
 #include "weapon/ammunition_dump.h"
 
@@ -68 +70 @@
   * @param mNode The scene node which the ship will be attached to later.
   */
-  OrxonoxShip::OrxonoxShip(SceneManager *sceneMgr, SceneNode *node,
-        BulletManager *bulletManager)
-              : sceneMgr_(sceneMgr),
-        baseThrust_(1000), currentThrust_(Vector3::ZERO),
-        objectCounter_(0), bulletManager_(bulletManager)
+  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);
@@ -115 +116 @@
 
     // initialise weapon(s)
-    ammoDump_ = new AmmunitionDump(420);
-    ammoDump_->store(420);
+    ammoDump_ = new AmmunitionDump();
+    ammoDump_->setDumpSize("Barrel", 1000);
+    ammoDump_->store("Barrel", 420);
 
     InertialNode *mainWeaponNode = rootNode_->createChildNode();
-    mainWeapon_ = new BaseWeapon(sceneMgr_, mainWeaponNode,
-          bulletManager_, ammoDump_);
+    mainWeapon_ = new BarrelGun(mainWeaponNode, ammoDump_);
 
     railGunStation_ = new WeaponStation(4);
@@ -216 +217 @@
   int OrxonoxShip::getAmmoStock()
   {
-    return ammoDump_->getStockSize();
+    return ammoDump_->getStockSize("Barrel");
   }