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

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.h (modified) (2 diffs)

code/branches/main_reto_vs05/src/orxonox_ship.h

@@ -54 +54 @@
     Ogre::Vector3 getSpeed();
 
-    weapon::WeaponManager* getMainWeapon();
+    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_;
   };