From ea245b969d1864441b41d25c7631beccfb39d874 Mon Sep 17 00:00:00 2001 From: Magnus Auvinen Date: Sun, 13 Jan 2008 11:15:32 +0000 Subject: new mapformat in place. continued the cleanup. some effects are gone, gonna be redone so no biggie. CTF isn't working now. --- src/game/g_mapitems.h | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'src/game/g_mapitems.h') diff --git a/src/game/g_mapitems.h b/src/game/g_mapitems.h index f6375d02..d7d8fa77 100644 --- a/src/game/g_mapitems.h +++ b/src/game/g_mapitems.h @@ -9,12 +9,15 @@ enum LAYERTYPE_GAME, // not used LAYERTYPE_TILES, LAYERTYPE_QUADS, -}; - - -// game layer tiles -enum -{ + + MAPITEMTYPE_VERSION=0, + MAPITEMTYPE_INFO, + MAPITEMTYPE_IMAGE, + MAPITEMTYPE_ENVELOPE, + MAPITEMTYPE_GROUP, + MAPITEMTYPE_LAYER, + + // game layer tiles ENTITY_NULL=0, ENTITY_SPAWN, ENTITY_SPAWN_RED, @@ -22,7 +25,7 @@ enum ENTITY_FLAGSTAND_RED, ENTITY_FLAGSTAND_BLUE, ENTITY_ARMOR_1, - ENTITY_HEATH_1, + ENTITY_HEALTH_1, ENTITY_WEAPON_SHOTGUN, ENTITY_WEAPON_ROCKET, ENTITY_POWERUP_NINJA, -- cgit 1.4.1