Changeset 10516 in orxonox.OLD for trunk/src/world_entities/player.cc

Timestamp:

Jan 30, 2007, 9:17:21 PM (17 years ago)

Author:

patrick

Message:

merged playability back to trunk

File:

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

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