Changeset 6444 in orxonox.OLD for trunk/src/world_entities/weapons

Timestamp:

Jan 8, 2006, 10:45:03 PM (19 years ago)

Author:

bensch

Message:

trunk: sliders get updated, as they should be

Location:

trunk/src/world_entities/weapons

Files:

• weapon.cc (modified) (3 diffs)
• weapon_manager.h (modified) (3 diffs)

trunk/src/world_entities/weapons/weapon.cc

@@ -421 +421 @@
     if (likely(this->soundBuffers[WA_ACTIVATE] != NULL))
       this->soundSource->play(this->soundBuffers[WA_ACTIVATE]);
+    this->updateWidgets();
     // activate
     PRINTF(4)("Activating the Weapon %s\n", this->getName());
@@ -482 +483 @@
     if (this->soundBuffers[WA_SHOOT] != NULL)
       this->soundSource->play(this->soundBuffers[WA_SHOOT]);
+    this->updateWidgets();
     // fire
     this->energyLoaded -= this->minCharge;
@@ -526 +528 @@
     this->energy -= chargeSize;
   }
+
+  this->updateWidgets();
   this->reload();
   this->enterState(WS_RELOADING);

trunk/src/world_entities/weapons/weapon_manager.h

@@ -9 +9 @@
  * @TODO 1. WeaponManager should also handle a List of availiableWeapons.
  */
+
+#ifndef _WEAPON_MANAGER_H
+#define _WEAPON_MANAGER_H
 
 #include "base_object.h"
@@ -70 +73 @@
     void addWeapon(Weapon* weapon, int configID = -1, int slotID = -1);
     void removeWeapon(Weapon* weapon, int configID = -1);
-    Weapon* getWeapon(int slotID) const { return (slotID >= 0 && slotID < this->slotCount)? this->currentSlotConfig[slotID].currentWeapon: NULL; };
+    Weapon* getWeapon(int slotID) const { return (slotID >= 0 && slotID < this->slotCount)? this->currentSlotConfig[slotID].nextWeapon: NULL; };
 
     // FIXME ::
@@ -109 +112 @@
     tAnimation<Crosshair>*  crossHairSizeAnim;                        //!< An animation for the crosshair (scaling)
 };
+
+
+#endif /* _WEAPON_MANAGER_H */