Changeset 10506 in orxonox.OLD

Timestamp:

Jan 30, 2007, 5:26:27 PM (17 years ago)

Author:

muellmic

Message:

fixed bug that let disappear the secondWeaponManager after changing the weaponconfig

Location:

branches/playability/src

Files:

• util/hud.cc (modified) (1 diff)
• world_entities/player.cc (modified) (1 diff)

branches/playability/src/util/hud.cc

@@ -515 +515 @@
     pos.x -= ySize;
     //PRINTF(0)("secweaponwidget y-size: %f/n", (*weaponWidget)->getSizeY2D());
-    (*weaponWidget)->setAbsCoor2D(pos.x + this->rightRect->getAbsCoor2D().x, pos.y);
+    (*weaponWidget)->setAbsCoor2D(pos.x, pos.y);//+this->rightRect->getAbsCoor2D().x, pos.y);
     (*weaponWidget)->show();
     //printf("update thing %s::%s\n", (*weaponWidget)->getClassCName(), (*weaponWidget)->getName());

branches/playability/src/world_entities/player.cc

@@ -100 +100 @@
   //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());
+  if (dynamic_cast<SpaceShip*>(this->playable) != NULL)
+    this->_hud.setWeaponManager(&this->playable->getWeaponManager(), &dynamic_cast<SpaceShip*>(this->playable)->getWeaponManagerSecondary());
+  else
+    this->_hud.setWeaponManager(&this->playable->getWeaponManager());
 }