From 3cb3379babb7a14ad0bee6f977816ea3818714b9 Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pjm@nac.net>
Date: Mon, 18 Feb 2013 18:04:59 -0500
Subject: Clean up map layers.

---
(limited to 'src/resources/map.h')

diff --git a/src/resources/map.h b/src/resources/map.h
index 02733bc..6d1d789 100644
--- a/src/resources/map.h
+++ b/src/resources/map.h
@@ -5,16 +5,14 @@
 #include "resource.h"
 #include "image.h"
 
-enum layer_id {
-	LAYER_GROUND = 0,
-	LAYER_OBJ_LOW,
-	LAYER_CHAR_BOT,
-	LAYER_OBJ_MID,
-	LAYER_CHAR_TOP,
-	LAYER_OBJ_HIGH,
-	LAYER_COLLISION,
-	LAYER_WEATHER,
-	LAYERS_MAX
+enum map_layer_id {
+	MAP_LAYER_GROUND = 0,
+	MAP_LAYER_OBJ_LOW,
+	MAP_LAYER_OBJ_MID,
+	MAP_LAYER_OBJ_HIGH,
+	MAP_LAYER_COLLISION,
+	MAP_LAYER_WEATHER,
+	MAP_LAYERS_MAX
 };
 struct tileset {
 	struct resource res;
@@ -90,7 +88,7 @@ struct map {
 	int tileheight;
 	struct map_tileset *tilesets_head;
 	struct map_tileset *tilesets_tail;
-	struct layer layers[LAYERS_MAX];
+	struct layer layers[MAP_LAYERS_MAX];
 	struct map_collision *collisions;
 	struct map_exit *map_exits_head;
 	struct map_exit *map_exits_tail;
--
cgit v0.9.1