Changeset 198 for code/branches/main_reto_vs05/src/run_manager.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/run_manager.cc (modified) (5 diffs)

code/branches/main_reto_vs05/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 "run_manager.h"
@@ -108 +108 @@
     // create a bullet manager
     bulletManager_ = new BulletManager(sceneMgr_);
-    WeaponManager::loadWeapons();
 
 
@@ -213 +212 @@
     if (bulletManager_)
       delete bulletManager_;
-
-    WeaponManager::destroyWeapons();
   }
 
@@ -352 +349 @@
 
     if (keyboard_->isKeyDown(KC_G))
-      playerShip_->getMainWeapon()->addAction(WeaponManager::RELOAD);
+      playerShip_->getMainWeapon()->addAction(BaseWeapon::RELOAD);
 
     if( keyboard_->isKeyDown(KC_ESCAPE) || keyboard_->isKeyDown(KC_Q) )
@@ -421 +418 @@
     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: "