Changeset 10278 in orxonox.OLD for branches/playability/src/world_entities

Timestamp:

Jan 17, 2007, 7:23:47 PM (18 years ago)

Author:

muellmic

Message:

fixed bug, that set false Coor2Ds for the weapon-widgets when changing the weapon configuration. lots of thanks 2 marc!

Location:

branches/playability/src/world_entities

Files:

• player.cc (modified) (1 diff)
• weapons/weapon.cc (modified) (1 diff)

branches/playability/src/world_entities/player.cc

@@ -98 +98 @@
 void Player::weaponConfigChanged()
 {
-  this->_hud.updateWeaponManager();
+  //this->_hud.updateWeaponManager();
+
+  if (dynamic_cast<SpaceShip*>(this->playable) != 0)
+      this->_hud.setWeaponManager(&this->playable->getWeaponManager(), &dynamic_cast<SpaceShip*>(this->playable)->getWeaponManagerSecondary());
+    else
+      this->_hud.setWeaponManager(&this->playable->getWeaponManager());
 }
 

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

@@ -392 +392 @@
 OrxGui::GLGuiWidget* Weapon::getEnergyWidget()
 {
-  if (this->energyWidget == NULL)
+  if ( this->energyWidget == NULL)
   {
     this->energyWidget = new OrxGui::GLGuiEnergyWidgetVertical();