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.c')

diff --git a/src/resources/map.c b/src/resources/map.c
index 514129d..3fbf12e 100644
--- a/src/resources/map.c
+++ b/src/resources/map.c
@@ -144,21 +144,15 @@ struct layer *
 map_get_layer(struct map *m, const char *name)
 {
 	if (strcmp(name, "ground") == 0) {
-		return &m->layers[LAYER_GROUND];
+		return &m->layers[MAP_LAYER_GROUND];
 	} else if (strcmp(name, "obj-low") == 0) {
-		return &m->layers[LAYER_OBJ_LOW];
-	} else if (strcmp(name, "char-bot") == 0) {
-		return &m->layers[LAYER_CHAR_BOT];
+		return &m->layers[MAP_LAYER_OBJ_LOW];
 	} else if (strcmp(name, "obj-mid") == 0) {
-		return &m->layers[LAYER_OBJ_MID];
-	} else if (strcmp(name, "char-top") == 0) {
-		return &m->layers[LAYER_CHAR_TOP];
+		return &m->layers[MAP_LAYER_OBJ_MID];
 	} else if (strcmp(name, "obj-high") == 0) {
-		return &m->layers[LAYER_OBJ_HIGH];
+		return &m->layers[MAP_LAYER_OBJ_HIGH];
 	} else if (strcmp(name, "collision") == 0) {
-		return &m->layers[LAYER_COLLISION];
-	} else if (strcmp(name, "weather") == 0) {
-		return &m->layers[LAYER_WEATHER];
+		return &m->layers[MAP_LAYER_COLLISION];
 	} else {
 		return NULL;
 	}
--
cgit v0.9.1