Changeset 10516 in orxonox.OLD for trunk/src/world_entities/weapons/weapon.h

Timestamp:

Jan 30, 2007, 9:17:21 PM (19 years ago)

Author:

patrick

Message:

merged playability back to trunk

File:

• trunk/src/world_entities/weapons/weapon.h (modified) (3 diffs)

trunk/src/world_entities/weapons/weapon.h

@@ -190 +190 @@
     inline int getPreferedSlot() { return this->preferedSlot; }
 
+    inline void setEnergyWidgetInitialized(bool b) {this->isEnergyWidgetInitialized = b;};
+
 
   protected:
@@ -207 +209 @@
 
     void setPreferedSlot(int slot, int side) { this->preferedSlot = slot; this->preferedSide = side; }
+
+    //gui
+    OrxGui::GLGuiEnergyWidgetVertical* energyWidget;
+    bool  isEnergyWidgetInitialized;
 
 
@@ -238 +244 @@
     float                maxCharge;                        //!< The maximal energy to be loaded onto one projectile (this is only availible if chargeable is enabled)
 
-    OrxGui::GLGuiEnergyWidgetVertical* energyWidget;
+    //OrxGui::GLGuiEnergyWidgetVertical* energyWidget;
 
     PNode*               defaultTarget;                    //!< A target for targeting Weapons.