Changeset 10698 in orxonox.OLD for trunk/src/world_entities/projectiles/hbolt.cc

Timestamp:

Jun 14, 2007, 5:33:43 PM (17 years ago)

Author:

snellen

Message:

merged adm, hud, vs-enhancements : beni's responsible for this commit. blame him!

File:

• trunk/src/world_entities/projectiles/hbolt.cc (modified) (5 diffs)

trunk/src/world_entities/projectiles/hbolt.cc

@@ -46 +46 @@
   this->setMinEnergy(10);
   this->setHealthMax(0);
-  this->lifeSpan = 2.0;
+  this->lifeSpan = 3.0;
 
   this->angle = 0;
@@ -116 +116 @@
 
   this->toList(OM_DEAD);
-  this->removeNode();
+//   this->removeNode();
   HBolt::fastFactory->kill(this);
 
@@ -177 +177 @@
   glPushAttrib(GL_ENABLE_BIT);
   glDisable(GL_LIGHTING);
-//   glDisable(GL_FOG);
+  glDisable(GL_FOG);
 
   glMatrixMode(GL_MODELVIEW);
@@ -184 +184 @@
 //     float matrix[4][4];
     glTranslatef (this->getAbsCoor ().x, this->getAbsCoor ().y, this->getAbsCoor ().z);
+    this->halo->draw();
+
     Vector tmpRot = this->getAbsDir().getSpacialAxis();
     glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
@@ -189 +191 @@
 //     glMultMatrixf((float*)matrix);
     this->getModel()->draw();
-    this->halo->draw();
 
   glPopMatrix();