Changeset 10101 in orxonox.OLD

Timestamp:

Dec 19, 2006, 6:30:24 PM (17 years ago)

Author:

muellmic

Message:

sry, energywidgetvertical was bound to wrong svn folder first

Location:

branches/playability/src/world_entities

Files:

• Makefile.am (modified) (1 diff)
• elements/glgui_energywidgetvertical.cc (deleted)
• elements/glgui_energywidgetvertical.h (deleted)
• world_entity.cc (modified) (2 diffs)
• world_entity.h (modified) (1 diff)

branches/playability/src/world_entities/Makefile.am

@@ -7 +7 @@
 ## THESE ARE THE BASE CLASSES OF ALL WORLD_ENTITIES
 libORXwe_a_SOURCES = world_entity.cc                            camera.cc               playable.cc             player.cc \
-                                        npcs/npc.cc                             weapons/weapon_manager.cc               weapons/crosshair.cc \
-                        weapons/weapon.cc               weapons/ammo_container.cc               projectiles/projectile.cc \
-                                        extendable.cc           power_ups/power_up.cc           power_ups/param_power_up.cc \
-                        power_ups/weapon_power_up.cc                            spawning_point.cc                                               effects/explosion.cc            effects/billboard.cc \
-                        effects/trail.cc                                elements/glgui_energywidget.cc
+                                                npcs/npc.cc                             weapons/weapon_manager.cc               weapons/crosshair.cc \
+                                weapons/weapon.cc               weapons/ammo_container.cc               projectiles/projectile.cc \
+                                                extendable.cc           power_ups/power_up.cc           power_ups/param_power_up.cc \
+                                power_ups/weapon_power_up.cc                            spawning_point.cc                                               effects/explosion.cc            effects/billboard.cc \
+                                effects/trail.cc                                elements/glgui_energywidget.cc glgui_energywidget.cc
 
 
 noinst_HEADERS = world_entity.h                                 camera.h                extendable.h            playable.h \
-                        player.h                                npcs/npc.h                              weapons/weapon_manager.h                weapons/crosshair.h \
-                        weapons/weapon.h                weapons/ammo_container.h                projectiles/projectile.h \
-                                        power_ups/power_up.h            power_ups/param_power_up.h              power_ups/weapon_power_up.h \
-                                        spawning_point.h                                                effects/explosion.h             effects/billboard.h             effects/trail.h \
-                                                                        elements/glgui_energywidget.h                                   
+                                player.h                                npcs/npc.h                              weapons/weapon_manager.h                weapons/crosshair.h \
+                                weapons/weapon.h                weapons/ammo_container.h                projectiles/projectile.h \
+                                                power_ups/power_up.h            power_ups/param_power_up.h              power_ups/weapon_power_up.h \
+                                                spawning_point.h                                                effects/explosion.h             effects/billboard.h             effects/trail.h \
+                                                                                elements/glgui_energywidget.h glgui_energywidget.h
 
 

branches/playability/src/world_entities/world_entity.cc

@@ -34 +34 @@
 
 #include "elements/glgui_energywidget.h"
+#include "elements/glgui_energywidgetvertical.h"
 
 #include "state.h"
@@ -750 +751 @@
   if (this->healthWidget == NULL)
   {
-    this->healthWidget = new OrxGui::GLGuiEnergyWidget();
+    this->healthWidget = new OrxGui::GLGuiEnergyWidgetVertical();
     this->healthWidget->setDisplayedName(std::string(this->getClassName()) + " Energy:");
     this->healthWidget->setSize2D(30,400);

branches/playability/src/world_entities/world_entity.h

@@ -183 +183 @@
   float                   health;             //!< The Energy of this Entity, if the Entity has any energy at all.
   float                   healthMax;          //!< The Maximal energy this entity can take.
-  OrxGui::GLGuiEnergyWidget* healthWidget;    //!< The Slider (if wanted).
+  OrxGui::GLGuiEnergyWidgetVertical* healthWidget;    //!< The Slider (if wanted).
 
   std::vector<Model*>     models;             //!< The model that should be loaded for this entity.