Changeset 6171 in orxonox.OLD

Timestamp:

Dec 20, 2005, 1:05:44 AM (18 years ago)

Author:

bensch

Message:

christmas: fixed the linking bug

File:

• branches/christmas_branche/src/world_entities/creatures/md2_creature.cc (modified) (2 diffs)

branches/christmas_branche/src/world_entities/creatures/md2_creature.cc

@@ -218 +218 @@
 {}
 
-WorldEntity* ref = NULL;
 /**
  *  this function is called, when two entities collide
@@ -227 +226 @@
 void MD2Creature::collidesWith(WorldEntity* entity, const Vector& location)
 {
-  if (entity->isA(CL_TURRET_POWER_UP) && entity != ref)
+  if (entity->isA(CL_TURRET_POWER_UP) )
   {
     this->ADDWEAPON();
-    ref = entity;
     }
 //  PRINTF(3)("collision %s vs %s @ (%f,%f,%f)\n", this->getClassName(), entity->getClassName(), location.x, location.y, location.z);