Changeset 10104 in orxonox.OLD for branches/playability/src/world_entities/projectiles/hbolt.cc

Timestamp:

Dec 19, 2006, 8:00:52 PM (17 years ago)

Author:

nicolasc

Message:

some beautifications, nothing new

File:

• branches/playability/src/world_entities/projectiles/hbolt.cc (modified) (7 diffs)

branches/playability/src/world_entities/projectiles/hbolt.cc

@@ -2 +2 @@
    orxonox - the future of 3D-vertical-scrollers
 
-   Copyright (C) 2004 orx
+   Copyright (C) 2004-2006 orx
 
    This program is free software; you can redistribute it and/or modify
@@ -10 +10 @@
 
    ### File Specific
-   main-programmer: Patrick Boenzli
+   main-programmer: Nicolas Schlumberger, Marc Schaerrer
    co-programmer: Benjamin Grauer
 
@@ -29 +29 @@
 // #include "effects/billboard.h"
 #include "space_ships/space_ship.h"
-
 
 #include "class_id_DEPRECATED.h"
@@ -60 +59 @@
   this->halo->setSize(.65, .65);
   this->halo->setTexture("hbolt_halo2.png");
-
 }
 
@@ -118 +116 @@
 void HBolt::collidesWith(WorldEntity* entity, const Vector& location)
 {
-  PRINTF(0)("Collision with HBolt\n");
-  if (this->hitEntity != entity && entity->isA(CL_NPC))
+  printf("Collision with HBolt\n");
+  if (this->hitEntity != entity/* && entity->isA(CL_NPC)*/ || entity == this->target)
     this->destroy( entity );
   this->hitEntity = entity;
   dynamic_cast<SpaceShip*>(entity)->damage( this->getPhysDamage(), this->getElecDamage());
-  this->deactivate();
-}
-
-
-void HBolt::updateAngle (float time)
-{
-  this->angle += this->rotationSpeed * time;
+//   this->deactivate();
 }
 
@@ -146 +138 @@
     this->deactivate();
 
-  this->updateAngle(dt);
+  this->angle += this->rotationSpeed * dt;
 
 
@@ -183 +175 @@
   this->getModel()->draw();
 
-//   this->mat->select();
-/*   dynamic_cast<StaticModel*>(this->getModel())->draw();*/
-//   this->mat->select();
-//   dynamic_cast<StaticModel*>(this->getModel())->draw();
-//   this->mat->unselect();
-
-
   glPopMatrix();
 }