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

Timestamp:

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

Author:

muellmic

Message:

fixed bug that let disappear the secondWeaponManager after changing the weaponconfig

File:

• branches/playability/src/world_entities/player.cc (modified) (1 diff)

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());
 }