Changeset 10516 in orxonox.OLD for trunk/src/world_entities/weapons/medium_blaster.cc

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/medium_blaster.cc (modified) (4 diffs)

trunk/src/world_entities/weapons/medium_blaster.cc

@@ -10 +10 @@
 
 #include "loading/fast_factory.h"
+
+#include "elements/glgui_energywidgetvertical.h"
 
 //
@@ -138 +140 @@
 }
 
+
 /**
  *  this activates the weapon
@@ -158 +161 @@
   glTranslatef (this->getAbsCoor ().x, this->getAbsCoor ().y, this->getAbsCoor ().z);
 
-  static_cast<StaticModel*>(this->getModel())->draw(2);
+  static_cast<StaticModel*>(this->getModel())->draw(0);
 
   glPushMatrix();
@@ -167 +170 @@
   glPushMatrix();
     glTranslatef (this->objComp[0][1]->getAbsCoor().x, this->objComp[0][1]->getAbsCoor().y, this->objComp[0][1]->getAbsCoor().z);
-    static_cast<StaticModel*>(this->getModel())->draw(0);
+    static_cast<StaticModel*>(this->getModel())->draw(2);
   glPopMatrix();
 
   glPopMatrix();
 }
+
+void MediumBlaster::tick(float dt)
+{
+  if (this->energyWidget != NULL && !this->isEnergyWidgetInitialized)
+  {
+    this->energyWidget->setDisplayedImage("textures/gui/gui_medium_bold.png");
+    this->setEnergyWidgetInitialized(true);
+  }
+}