Changeset 7081 in orxonox.OLD for trunk/src

Timestamp:

Feb 7, 2006, 4:31:54 PM (19 years ago)

Author:

bensch

Message:

better stuff

Location:

trunk/src/world_entities

Files:

• projectiles/guided_missile.cc (modified) (1 diff)
• projectiles/hyperblast.cc (modified) (2 diffs)
• weapons/targeting_turret.cc (modified) (1 diff)

trunk/src/world_entities/projectiles/guided_missile.cc

@@ -42 +42 @@
   this->setMinEnergy(1);
   this->setHealthMax(10);
-  this->lifeSpan = 10.0;
+  this->lifeSpan = 4.0;
   this->agility = 1;
   this->maxVelocity = 75;

trunk/src/world_entities/projectiles/hyperblast.cc

@@ -140 +140 @@
 void Hyperblast::draw () const
 {
+  if (this->lifeCycle < .1)
+  {
   glMatrixMode(GL_MODELVIEW);
   glPushMatrix();
@@ -150 +152 @@
 
 //  glScalef(2.0, this->size, this->size);
-//  this->getModel()->draw();
+  this->getModel()->draw();
 
   glPopMatrix();
+  }
 }
 

trunk/src/world_entities/weapons/targeting_turret.cc

@@ -116 +116 @@
 void TargetingTurret::activate()
 {
-  this->target->setVisibility(true);
+  // TODO move this back in
+  //this->target->setVisibility(true);
 }