about summary refs log tree commit diff
path: root/src/game/g_mapitems.h
diff options
context:
space:
mode:
authorMagnus Auvinen <magnus.auvinen@gmail.com>2008-01-13 11:15:32 +0000
committerMagnus Auvinen <magnus.auvinen@gmail.com>2008-01-13 11:15:32 +0000
commitea245b969d1864441b41d25c7631beccfb39d874 (patch)
tree68fb62ef99cdd90f5dd4ec8edf11e7bb54b7f953 /src/game/g_mapitems.h
parent906ece7894927983b8ac69e37dd3cb82cfe7aad1 (diff)
downloadzcatch-ea245b969d1864441b41d25c7631beccfb39d874.tar.gz
zcatch-ea245b969d1864441b41d25c7631beccfb39d874.zip
new mapformat in place. continued the cleanup. some effects are gone, gonna be redone so no biggie. CTF isn't working now.
Diffstat (limited to 'src/game/g_mapitems.h')
-rw-r--r--src/game/g_mapitems.h17
1 files changed, 10 insertions, 7 deletions
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,