Changeset 198 for code/branches/main_reto_vs05/src/orxonox_ship.cc

Timestamp:

Nov 13, 2007, 9:25:37 PM (16 years ago)

Author:

rgrieder

Message:

• added a simple ammo dump
• created BaseWeapon from WeaponManager
• created the WeaponStation object

File:

• code/branches/main_reto_vs05/src/orxonox_ship.cc (modified) (5 diffs)

code/branches/main_reto_vs05/src/orxonox_ship.cc

@@ -36 +36 @@
 #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/ammunition_dump.h"
 
 #include "orxonox_ship.h"
@@ -68 +70 @@
   OrxonoxShip::OrxonoxShip(SceneManager *sceneMgr, SceneNode *node,
         BulletManager *bulletManager)
-              : sceneMgr_(sceneMgr), //currentSpeed_(Vector3(0, 0, 0)),
+              : sceneMgr_(sceneMgr),
         baseThrust_(1000), currentThrust_(Vector3::ZERO),
-        objectCounter_(0), bulletManager_(bulletManager)//, bulletSpeed_(400)
+        objectCounter_(0), bulletManager_(bulletManager)
   {
     rootNode_ = new InertialNode(node, Vector3::ZERO);
@@ -84 +86 @@
     if (mainWeapon_)
       delete mainWeapon_;
+    if (railGunStation_)
+      delete railGunStation_;
     if (rootNode_)
       delete rootNode_;
@@ -111 +115 @@
 
     // initialise weapon(s)
+    ammoDump_ = new AmmunitionDump(420);
+    ammoDump_->store(420);
+
     InertialNode *mainWeaponNode = rootNode_->createChildNode();
-    mainWeapon_ = new WeaponManager(sceneMgr_, mainWeaponNode,
-          bulletManager_, 1);
-    mainWeapon_->addWeapon("Barrel Gun");
+    mainWeapon_ = new BaseWeapon(sceneMgr_, mainWeaponNode,
+          bulletManager_, ammoDump_);
+
+    railGunStation_ = new WeaponStation(4);
+    railGunStation_->addWeapon(mainWeapon_);
+    railGunStation_->selectWeapon(0);
 
           return true;
@@ -198 +208 @@
   * @return Bullet containing speed and entity.
   */
-  WeaponManager* OrxonoxShip::getMainWeapon()
+  BaseWeapon* OrxonoxShip::getMainWeapon()
   {
     return mainWeapon_;
+  }
+
+
+  int OrxonoxShip::getAmmoStock()
+  {
+    return ammoDump_->getStockSize();
   }