Changeset 10693 in orxonox.OLD

Timestamp:

Jun 14, 2007, 1:20:36 PM (17 years ago)

Author:

bknecht

Message:

fixed errors

Location:

branches/hud/src

Files:

• util/hud.cc (modified) (1 diff)
• world_entities/player.cc (modified) (2 diffs)
• world_entities/space_ships/space_ship.cc (modified) (1 diff)

branches/hud/src/util/hud.cc

@@ -183 +183 @@
         {
                 this->healthWidget = new OrxGui::GLGuiBar();
-                this->healthWidget->setMaximum(widget->getBarWidget()->maximum());
-        this->healthWidget->setValue(widget->getBarWidget()->value());
-        this->healthWidget->setParent2D(this->barSocket);
+                dynamic_cast<OrxGui::GLGuiBar*> (this->healthWidget)->setMaximum(dynamic_cast<OrxGui::GLGuiEnergyWidgetVertical*> (widget)->getBarWidget()->maximum());
+                dynamic_cast<OrxGui::GLGuiBar*> (this->healthWidget)->setValue(dynamic_cast<OrxGui::GLGuiEnergyWidgetVertical*> (widget)->getBarWidget()->value());
+                this->healthWidget->setParent2D(this->barSocket);
         }
         else

branches/hud/src/world_entities/player.cc

@@ -19 +19 @@
 
 #include "event_handler.h"
-#include "fps_player.h"
+#include "creatures/fps_player.h"
 
 #include "state.h"
@@ -76 +76 @@
     this->playable = playable;
     
-    if( playable->isA(FpsPlayer::staticClassID()) )
+    if( playable->isA(FPSPlayer::staticClassID()) )
     {
-        this->_hud.setMod(Hud::Playmode FirstPerson);
+        this->_hud.setMode(Hud::FirstPerson);
         this->_hud.setHealthWidget(this->playable->getHealthWidget());
     }
     else
     {
-        this->_hud.setMode(Hud::Playmode Full3D);
+        this->_hud.setMode(Hud::Full3D);
         this->_hud.setHealthWidget(this->playable->getHealthWidget());
     }

branches/hud/src/world_entities/space_ships/space_ship.cc

@@ -1135 +1135 @@
     this->updateShieldWidget();
     if (this->hasPlayer())
-      State::getPlayer()->hud().setShiledWidget(this->shieldWidget);
+      State::getPlayer()->hud().setShieldWidget(this->shieldWidget);
   }
 }