Changeset 10261 in orxonox.OLD for branches/playability/src/world_entities/projectiles/mbolt.cc

Timestamp:

Jan 17, 2007, 4:14:41 PM (17 years ago)

Author:

marcscha

Message:

Fixes and cleanups

File:

• branches/playability/src/world_entities/projectiles/mbolt.cc (modified) (4 diffs)

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

@@ -75 +75 @@
 
   dynamic_cast<StaticModel*>(this->getModel())->rebuild();
-  this->buildObbTree(4);
+  //this->buildObbTree(4);
   
   this->trail = new Trail(6, 4, .1, this);
@@ -141 +141 @@
 }
 
-/*
-void MBolt::collidesWith(WorldEntity* entity, const Vector& location)
+void MBolt::hit (WorldEntity* entity, float damage)
 {
 
@@ -148 +147 @@
     this->destroy( entity );
   this->hitEntity = entity;
-  dynamic_cast<SpaceShip*>(entity)->damage(this->getPhysDamage(),this->getElecDamage());
+ // dynamic_cast<SpaceShip*>(entity)->damage(this->getPhysDamage(),this->getElecDamage());
   //this->destroy(this);
   this->deactivate();
@@ -154 +153 @@
   return;
 
-  //dynamic_cast<SpaceShip*>(entity)->damage( this->getPhysDamage(), this->getElecDamage());
-  //entity->destroy(this);
-  //this->deactivate();
-}*/
+}
 
 /**