Changeset 9965 in orxonox.OLD for branches/playability/src/world_entities/weapons

Timestamp:

Nov 28, 2006, 11:54:34 PM (18 years ago)

Author:

marcscha

Message:

Modifications to ship, HUD,.. see changelog

Location:

branches/playability/src/world_entities/weapons

Files:

• weapon.h (modified) (2 diffs)
• weapon_manager.cc (modified) (1 diff)
• weapon_manager.h (modified) (1 diff)

branches/playability/src/world_entities/weapons/weapon.h

@@ -169 +169 @@
     bool check() const;
     void debug() const;
+
+    void updateWidgets();
 
   protected:
@@ -200 +202 @@
     inline void enterState(WeaponState state);
 
-    void updateWidgets();
+    
 
   private:

branches/playability/src/world_entities/weapons/weapon_manager.cc

@@ -317 +317 @@
 
 /**
- * @brief does the same as the funtion inclreaseAmmunition, added four your convenience
+ * @brief does the same as the funtion increaseAmmunition, added four your convenience
  * @param weapon, the Weapon to read the ammo-info about.
  * @param ammo how much ammo to add.
  */
-float WeaponManager::inclreaseAmmunition(const Weapon* weapon, float ammo)
+float WeaponManager::increaseAmmunition(const Weapon* weapon, float ammo)
 {
   assert (weapon != NULL);

branches/playability/src/world_entities/weapons/weapon_manager.h

@@ -91 +91 @@
 
     float increaseAmmunition(const ClassID& projectileType, float ammo);
-    float inclreaseAmmunition(const Weapon* weapon, float ammo);
+    float increaseAmmunition(const Weapon* weapon, float ammo);
 
     /** @returns a fixed target namely the Crosshair's 3D position */