Changeset 10114 in orxonox.OLD for trunk/src/world_entities/projectiles/bomb.cc

Timestamp:

Dec 19, 2006, 11:55:26 PM (19 years ago)

Author:

patrick

Message:

merged network back to trunk

File:

• trunk/src/world_entities/projectiles/bomb.cc (modified) (2 diffs)

trunk/src/world_entities/projectiles/bomb.cc

@@ -25 +25 @@
 #include "debug.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(Bomb, CL_BOMB);
+
+ObjectListDefinition(Bomb);
 CREATE_FAST_FACTORY_STATIC(Bomb);
 
@@ -166 +166 @@
 void Bomb::collidesWith (WorldEntity* entity, const Vector& location)
 {
-  if (this->lifeCycle < .9f && entity->isA(CL_NPC))
+  if (this->lifeCycle < .9f && entity->isA( "NPC" ))
     this->lifeCycle = 0.9f;
 }