Set entity types.

src/defs.h

@@ -87,6 +87,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 enum
 {
+	ET_NONE,
 	ET_EFFECT, 
 	ET_TRAP, 
 	ET_BOB, 

src/world/entities/blobs/bob.c

@@ -20,6 +20,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "bob.h"
 
+void initBob(Entity *e)
+{
+	e->type = ET_BOB;
+}
+
 void addBobItem(Item *i)
 {
 	

src/world/entities/blobs/mia.c

@@ -34,6 +34,8 @@ void initMIA(Entity *e)
 	
 	m = (MIA*)e;
 	
+	m->type = ET_MIA;
+	
 	m->tx = m->ty = -1;
 
 	m->sprite[FACING_LEFT] = getSpriteIndex("MIA");

src/world/entities/boss/boss.c

@@ -28,6 +28,8 @@ void initBoss(Entity *e)
 	
 	b = (Boss*)e;
 	
+	b->type = ET_BOSS;
+	
 	b->sprite[FACING_LEFT] = b->sprite[FACING_RIGHT] = b->sprite[FACING_DIE] = getSpriteIndex("Boss");
 	
 	b->isMissionTarget = 1;

src/world/entities/cannons/cannon.c

@@ -36,6 +36,8 @@ void initCannon(Entity *e)
 	
 	u = (Unit*)self;
 	
+	u->type = ET_ENEMY;
+
 	u->sprite[FACING_LEFT] = getSpriteIndex("CannonLeft");
 	u->sprite[FACING_RIGHT] = getSpriteIndex("CannonRight");
 	u->sprite[FACING_DIE] = getSpriteIndex("CannonLeft");

src/world/entities/decoration/debris.c

@@ -32,6 +32,8 @@ void initDebris(Entity *e)
 	
 	d = (Decoration*)self;
 	
+	d->type = ET_DECORATION;
+	
 	d->effectType = rand() % 2;
 
 	d->flags |= EF_BOUNCES | EF_IGNORE_BULLETS | EF_KILL_OFFSCREEN | EF_NO_TELEPORT;

src/world/entities/decoration/fleshChunk.c

@@ -32,6 +32,8 @@ void initFleshChunk(Entity *e)
 	
 	d = (Decoration*)e;
 	
+	d->type = ET_DECORATION;
+
 	d->flags |= EF_BOUNCES | EF_IGNORE_BULLETS | EF_KILL_OFFSCREEN | EF_NO_TELEPORT;
 
 	d->bleedTime = FPS * 3;

src/world/entities/items/cell.c

@@ -30,6 +30,8 @@ void initCell(Entity *e)
 	
 	i = (Item*)self;
 	
+	i->type = ET_HEART_CELL;
+
 	i->isMissionTarget = 1;
 
 	STRNCPY(i->spriteName, "Battery", MAX_NAME_LENGTH);

src/world/entities/items/consumable.c

@@ -25,6 +25,10 @@ static void die(void);
 
 void initConsumable(Entity *e)
 {
+	initEntity(e);
+	
+	e->type = ET_CONSUMABLE;
+	
 	e->flags |= EF_IGNORE_BULLETS;
 
 	e->health = FPS * 10;

src/world/entities/items/consumable.h

@@ -20,4 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "../../../common.h"
 
+extern void initEntity(Entity *e);
+
 extern Entity *self;

src/world/entities/items/heart.c

@@ -31,6 +31,8 @@ void initHeart(Entity *e)
 	
 	i = (Item*)e;
 	
+	i->type = ET_HEART_CELL;
+
 	i->isMissionTarget = 1;
 
 	STRNCPY(i->spriteName, "Heart", MAX_NAME_LENGTH);

src/world/entities/items/item.c

@@ -37,6 +37,8 @@ void initItem(Entity *e)
 	
 	i = (Item*)e;
 	
+	i->type = ET_ITEM;
+
 	STRNCPY(i->spriteName, "Weapon", MAX_NAME_LENGTH);
 
 	i->flags |= EF_IGNORE_BULLETS;

src/world/entities/items/key.c

@@ -28,6 +28,8 @@ void initBronzeKey(Entity *e)
 	
 	i = (Item*)e;
 	
+	i->type = ET_KEY;
+
 	STRNCPY(i->name, "Bronze Key", MAX_NAME_LENGTH);
 	STRNCPY(i->spriteName, "BronzeKey", MAX_NAME_LENGTH);
 }
@@ -40,6 +42,8 @@ void initSilverKey(Entity *e)
 	
 	i = (Item*)e;
 	
+	i->type = ET_KEY;
+
 	STRNCPY(i->name, "Silver Key", MAX_NAME_LENGTH);
 	STRNCPY(i->spriteName, "SilverKey", MAX_NAME_LENGTH);
 }
@@ -52,6 +56,8 @@ void initGoldKey(Entity *e)
 	
 	i = (Item*)e;
 	
+	i->type = ET_KEY;
+
 	STRNCPY(i->name, "Gold Key", MAX_NAME_LENGTH);
 	STRNCPY(i->spriteName, "GoldKey", MAX_NAME_LENGTH);
 }

src/world/entities/items/keycard.c

@@ -31,6 +31,8 @@ void initRedKeycard(Entity *e)
 	
 	i = (Item*)e;
 	
+	i->type = ET_KEY;
+
 	STRNCPY(i->name, "Red Keycard", MAX_NAME_LENGTH);
 	STRNCPY(i->spriteName, "RedKeycard", MAX_NAME_LENGTH);
 }
@@ -43,6 +45,8 @@ void initBlueKeycard(Entity *e)
 	
 	i = (Item*)e;
 	
+	i->type = ET_KEY;
+
 	STRNCPY(i->name, "Blue Keycard", MAX_NAME_LENGTH);
 	STRNCPY(i->spriteName, "BlueKeycard", MAX_NAME_LENGTH);
 }
@@ -55,6 +59,8 @@ void initGreenKeycard(Entity *e)
 	
 	i = (Item*)e;
 	
+	i->type = ET_KEY;
+
 	STRNCPY(i->name, "Green Keycard", MAX_NAME_LENGTH);
 	STRNCPY(i->spriteName, "GreenKeycard", MAX_NAME_LENGTH);
 }
@@ -67,6 +73,8 @@ void initYellowKeycard(Entity *e)
 	
 	i = (Item*)e;
 	
+	i->type = ET_KEY;
+
 	STRNCPY(i->name, "Yellow Keycard", MAX_NAME_LENGTH);
 	STRNCPY(i->spriteName, "YellowKeycard", MAX_NAME_LENGTH);
 }
@@ -79,6 +87,8 @@ void initWhiteKeycard(Entity *e)
 	
 	i = (Item*)e;
 	
+	i->type = ET_KEY;
+
 	STRNCPY(i->name, "White Keycard", MAX_NAME_LENGTH);
 	STRNCPY(i->spriteName, "WhiteKeycard", MAX_NAME_LENGTH);
 

src/world/entities/misc/destructable.c

@@ -31,6 +31,8 @@ void initDestructable(Entity *e)
 	
 	s = (Structure*)e;
 	
+	s->type = ET_DESTRUCTABLE;
+	
 	s->isMissionTarget = 1;
 
 	STRNCPY(s->spriteName, "Crate4", MAX_NAME_LENGTH);

src/world/entities/misc/infoPoint.c

@@ -31,6 +31,8 @@ void initInfoPoint(Entity *e)
 	
 	s = (Structure*)e;
 	
+	s->type = ET_INFO_POINT;
+	
 	s->sprite[0] = s->sprite[1] = s->sprite[2] = getSpriteIndex("InfoPoint");
 
 	s->flags |= EF_WEIGHTLESS | EF_IGNORE_BULLETS | EF_NO_CLIP | EF_NO_ENVIRONMENT;

src/world/entities/structures/cardReader.c

@@ -31,6 +31,8 @@ void initCardReader(Entity *e)
 	
 	s = (Structure*)e;
 	
+	s->type = ET_CARD_READER;
+	
 	s->flags |= EF_WEIGHTLESS | EF_NO_CLIP | EF_NO_ENVIRONMENT | EF_IGNORE_BULLETS | EF_NO_TELEPORT;
 
 	STRNCPY(s->requiredItem, "Black Keycard", MAX_NAME_LENGTH);

src/world/entities/structures/door.c

@@ -35,6 +35,8 @@ void initDoor(Entity *e)
 	
 	s = (Structure*)e;
 	
+	s->type = ET_DOOR;
+	
 	s->isSolid = 1;
 
 	s->flags |= EF_WEIGHTLESS | EF_NO_ENVIRONMENT | EF_NO_CLIP | EF_EXPLODES | EF_NO_TELEPORT;

src/world/entities/structures/exit.c

@@ -33,6 +33,8 @@ void initExit(Entity *e)
 	
 	s = (Structure*)e;
 	
+	s->type = ET_EXIT;
+	
 	s->sprite[FACING_LEFT] = s->sprite[FACING_RIGHT] = s->sprite[FACING_DIE] = getSpriteIndex("Exit");
 
 	s->flags |= EF_WEIGHTLESS | EF_NO_CLIP | EF_NO_ENVIRONMENT | EF_IGNORE_BULLETS;

src/world/entities/structures/horizontalDoor.c

@@ -22,7 +22,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 void initHorizontalDoor(Entity *e)
 {
-	initEntity(e);
+	initDoor(e);
+	
+	e->type = ET_DOOR;
 	
 	e->sprite[0] = e->sprite[1] = e->sprite[2] = getSpriteIndex("HorizonalDoor");
 }

src/world/entities/structures/horizontalDoor.h

@@ -20,5 +20,5 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "../../../common.h"
 
-extern void initEntity(Entity *e);
+extern void initDoor(Entity *e);
 extern int getSpriteIndex(char *name);

src/world/entities/structures/itemPad.c

@@ -27,6 +27,8 @@ void initItemPad(Entity *e)
 {
 	initEntity(e);
 	
+	e->type = ET_ITEM_PAD;
+	
 	e->flags |= EF_WEIGHTLESS | EF_NO_CLIP | EF_NO_ENVIRONMENT | EF_IGNORE_BULLETS;
 
 	e->plane = PLANE_FOREGROUND;

src/world/entities/structures/lift.c

@@ -31,6 +31,8 @@ void initLift(Entity *e)
 	
 	s = (Structure*)e;
 	
+	s->type = ET_LIFT;
+	
 	s->state = LIFT_GOTO_FINISH;
 
 	s->flags |= EF_WEIGHTLESS | EF_NO_ENVIRONMENT | EF_EXPLODES | EF_NO_CLIP | EF_ALWAYS_PROCESS | EF_NO_TELEPORT;

src/world/entities/structures/powerPoint.c

@@ -32,6 +32,8 @@ void initPowerPoint(Entity *e)
 	
 	s = (Structure*)e;
 	
+	s->type = ET_POWER_POINT;
+
 	s->sprite[FACING_LEFT] = s->sprite[FACING_RIGHT] = s->sprite[FACING_DIE] = getSpriteIndex("PowerPoint");
 
 	s->flags |= EF_WEIGHTLESS | EF_NO_CLIP | EF_NO_ENVIRONMENT | EF_IGNORE_BULLETS;

src/world/entities/structures/powerPool.c

@@ -32,6 +32,8 @@ void initPowerPool(Entity *e)
 	
 	s = (Structure*)e;
 	
+	s->type = ET_POOL;
+	
 	s->sprite[FACING_LEFT] = s->sprite[FACING_RIGHT] = s->sprite[FACING_DIE] = getSpriteIndex("PowerPool");
 
 	s->flags |= EF_WEIGHTLESS | EF_NO_CLIP | EF_IGNORE_BULLETS;

src/world/entities/structures/pressurePlate.c

@@ -31,6 +31,8 @@ void initPressurePlate(Entity *e)
 	
 	s = (Structure*)e;
 	
+	s->type = ET_PRESSURE_PLATE;
+	
 	s->sprite[FACING_LEFT] = s->sprite[FACING_RIGHT] = s->sprite[FACING_DIE] = getSpriteIndex("PressurePlate");
 
 	s->flags |= EF_WEIGHTLESS | EF_NO_CLIP | EF_NO_ENVIRONMENT | EF_IGNORE_BULLETS;

src/world/entities/structures/pushBlock.c

@@ -30,6 +30,8 @@ void initPushBlock(Entity *e)
 	
 	s = (Structure*)e;
 	
+	s->type = ET_PUSHBLOCK;
+	
 	s->isSolid = 1;
 
 	s->startX = s->startY = -1;

src/world/entities/structures/teleporter.c

@@ -28,6 +28,8 @@ void initTeleporter(Entity *e)
 {
 	initEntity(e);
 	
+	e->type = ET_TELEPORTER;
+	
 	e->flags |= EF_WEIGHTLESS | EF_NO_CLIP | EF_IGNORE_BULLETS | EF_NO_TELEPORT;
 
 	e->plane = PLANE_FOREGROUND;

src/world/entities/traps/horizontalLaserTrap.c

@@ -24,5 +24,7 @@ void initHorizontalLaserTrap(Entity *e)
 {
 	initLaserTrap(e);
 	
+	e->type = ET_TRAP;
+	
 	e->sprite[0] = e->sprite[1] = e->sprite[2] = getSpriteIndex("HorizontalLaserTrap");
 }

src/world/entities/traps/laserTrap.c

@@ -34,6 +34,8 @@ void initLaserTrap(Entity *e)
 	
 	t = (Trap*)e;
 	
+	t->type = ET_TRAP;
+	
 	t->flags |= EF_WEIGHTLESS | EF_IGNORE_BULLETS | EF_NO_ENVIRONMENT | EF_NO_CLIP | EF_ALWAYS_PROCESS;
 
 	t->onTime = FPS * 2;