Changeset 6441 in orxonox.OLD for trunk/src/world_entities

Timestamp:

Jan 8, 2006, 4:02:30 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: the Hud now scales the Widgets itself

Location:

trunk/src/world_entities

Files:

• player.cc (modified) (4 diffs)
• player.h (modified) (2 diffs)

trunk/src/world_entities/player.cc

@@ -38 +38 @@
 
   this->controllable = NULL;
-  this->hud = new Hud();
+  this->hud.show();
 
   EventHandler::getInstance()->subscribe(this, ES_GAME, SDLK_l);
@@ -49 +49 @@
 Player::~Player ()
 {
-  delete this->hud;
 
 }
@@ -59 +58 @@
   {
       this->controllable = controllable;
-      this->hud->setEnergyWidget(this->controllable->getEnergyWidget());
+      this->hud.setEnergyWidget(this->controllable->getEnergyWidget());
       return true;
   }
@@ -73 +72 @@
    {
      this->controllable = NULL;
-     this->hud->setEnergyWidget(NULL);
+     this->hud.setEnergyWidget(NULL);
      return true;
    }

trunk/src/world_entities/player.h

@@ -9 +9 @@
 #include "event_listener.h"
 
+#include "util/hud.h"
+
 /* Forward Declaration */
 class Playable;
-class Hud;
+
 
 //! Basic controllable WorldEntity
@@ -36 +38 @@
   private:
     Playable*         controllable;                  //!< The one we controll or NULL if none
-    Hud*              hud;                           //!< The HUD to be displayed.
+    Hud               hud;                           //!< The HUD to be displayed for this Player.
 };