Changeset 8976 in orxonox.OLD for trunk/src/world_entities/weapons

Timestamp:

Jul 1, 2006, 1:05:38 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: the hud displays Energy and WeaponEnergy

Location:

trunk/src/world_entities/weapons

Files:

• weapon.cc (modified) (2 diffs)
• weapon.h (modified) (2 diffs)

trunk/src/world_entities/weapons/weapon.cc

@@ -34 +34 @@
 #include "sound_buffer.h"
 
-#include "glgui_bar.h"
+#include "elements/glgui_energywidget.h"
 
 using namespace std;
@@ -312 +312 @@
   if (this->energyWidget == NULL)
   {
-    this->energyWidget = new OrxGui::GLGuiBar;
+    this->energyWidget = new OrxGui::GLGuiEnergyWidget;
     this->energyWidget->setSize2D( 20, 100);
     this->energyWidget->setMaximum(this->getEnergyMax());

trunk/src/world_entities/weapons/weapon.h

@@ -25 +25 @@
 class TiXmlElement;
 class FastFactory;
-namespace OrxGui{ class GLGuiWidget; }
 template<class T> class tFastFactory;
 
@@ -210 +209 @@
     float                maxCharge;                        //!< The maximal energy to be loaded onto one projectile (this is only availible if chargeable is enabled)
 
-    OrxGui::GLGuiBar*    energyWidget;
+    OrxGui::GLGuiEnergyWidget* energyWidget;
 
     PNode*               defaultTarget;                    //!< A target for targeting Weapons.