Changeset 9966 in orxonox.OLD

Timestamp:

Nov 29, 2006, 10:04:35 AM (17 years ago)

Author:

marcscha

Message:

move of HUD update from SpaceShip to Weapon::increaseEnergy

Location:

branches/playability/src/world_entities

Files:

• space_ships/space_ship.cc (modified) (1 diff)
• weapons/weapon.cc (modified) (2 diffs)
• weapons/weapon.h (modified) (2 diffs)

branches/playability/src/world_entities/space_ships/space_ship.cc

@@ -658 +658 @@
     {
       weapon->increaseEnergy( energy);
-      weapon->updateWidgets();
     }
 

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

@@ -378 +378 @@
   {
     this->energy += energyToAdd;
+    this->updateWidgets();
     return 0.0;
   }
@@ -383 +384 @@
   {
     this->energy += maxAddEnergy;
+    this->updateWidgets();
     return energyToAdd - maxAddEnergy;
   }
+  
 }
 

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

@@ -170 +170 @@
     void debug() const;
 
-    void updateWidgets();
+    
 
   protected:
@@ -202 +202 @@
     inline void enterState(WeaponState state);
 
-    
+    void updateWidgets();
 
   private: