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

Timestamp:

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

Author:

patrick

Message:

merged network back to trunk

File:

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

trunk/src/world_entities/projectiles/test_bullet.cc

@@ -24 +24 @@
 #include "debug.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(TestBullet, CL_TEST_BULLET);
+
+ObjectListDefinition(TestBullet);
 CREATE_FAST_FACTORY_STATIC(TestBullet);
 
@@ -119 +119 @@
 void TestBullet::collidesWith(WorldEntity* entity, const Vector& location)
 {
-  if (this->hitEntity != entity && entity->isA(CL_NPC))
+  if (this->hitEntity != entity && entity->isA( "NPC" ))
     this->destroy( entity );
   this->hitEntity = entity;