Changeset 10362 in orxonox.OLD for branches/playability.new/src/world_entities/player.cc

Timestamp:

Jan 25, 2007, 3:05:01 AM (17 years ago)

Author:

patrick

Message:

merged playability. but got strange bug

Location:

branches/playability.new

Files:

• . (modified) (1 prop)
• src/world_entities/player.cc (modified) (4 diffs)

branches/playability.new

@@ -10 +10 @@
 autom4te.cache
 aclocal.m4
+tags
+test.bmp
+config.sub
+config.guess
+OrxonoxPlayability.kdevses
+OrxonoxPlayability.kdevelop.pcs

@@ -10 +10 @@
 autom4te.cache
 aclocal.m4
+tags
+test.bmp
+config.sub
+config.guess
+OrxonoxPlayability.kdevses
+OrxonoxPlayability.kdevelop.pcs

branches/playability.new/src/world_entities/player.cc

@@ -16 +16 @@
 #include "player.h"
 #include "playable.h"
+#include "space_ships/space_ship.h"
 
 #include "event_handler.h"
@@ -73 +74 @@
     PRINTF(4)("Enter new Playable\n");
     this->playable = playable;
-    this->_hud.setEnergyWidget(this->playable->getHealthWidget());
-    this->_hud.setWeaponManager(&this->playable->getWeaponManager());
+    this->_hud.setArmorWidget(this->playable->getHealthWidget());
+    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());
 
     this->playable->setPlayer(this);
@@ -94 +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());
 }
 
@@ -128 +137 @@
 }
 
+

@@ -10 +10 @@
 autom4te.cache
 aclocal.m4
+tags
+test.bmp
+config.sub
+config.guess
+OrxonoxPlayability.kdevses
+OrxonoxPlayability.kdevelop.pcs