Changeset 198 for code/branches/main_reto_vs05/src/weapon/weapon.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/weapon/weapon.h (modified) (4 diffs)

code/branches/main_reto_vs05/src/weapon/weapon.h

@@ -26 +26 @@
  */
 
+#if 0
 
 #ifndef WEAPON_H
@@ -42 +43 @@
   public:
     Weapon(const Ogre::String &name, int firePower, int firingRate,
-      Ogre::Real bulletSpeed)
+      Ogre::Real bulletSpeed, int magazineSize)
           : name_(name), firePower_(firePower), firingRate_(firingRate),
-          bulletSpeed_(bulletSpeed) { }
+          bulletSpeed_(bulletSpeed), magazineSize_(magazineSize) { }
 
     virtual ~Weapon() { }
@@ -53 +54 @@
     int firingRate_;
     Ogre::Real bulletSpeed_;
+    int magazineSize_;
   };
 
@@ -59 +61 @@
 
 #endif /* WEAPON_H */
+
+#endif