From 8a133b5f181e7b6e7f89e5d9f1a362e8ad87e3ad Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pjm@nac.net>
Date: Tue, 19 Feb 2013 14:18:26 -0500
Subject: Merge src/layer.h into src/area.h.

---
(limited to 'src')

diff --git a/src/area.c b/src/area.c
index f90cc09..c01d826 100644
--- a/src/area.c
+++ b/src/area.c
@@ -1,6 +1,5 @@
 #include <SDL.h>
 #include "area.h"
-#include "layer.h"
 #include "viewport.h"
 #include "resources/map.h"
 #include "logging.h"
diff --git a/src/area.h b/src/area.h
index aaddf1f..84987b7 100644
--- a/src/area.h
+++ b/src/area.h
@@ -2,10 +2,15 @@
 #define AREA_H
 
 #include <SDL.h>
-#include "layer.h"
 #include "viewport.h"
 #include "resources/map.h"
 
+enum area_layer_id {
+	AREA_LAYER_BOT = 0,
+	AREA_LAYER_MID,
+	AREA_LAYER_TOP,
+	AREA_LAYERS_MAX
+};
 struct area {
 	SDL_Surface *map_layers[AREA_LAYERS_MAX];
 };
diff --git a/src/layer.h b/src/layer.h
deleted file mode 100644
index c771eff..0000000
--- a/src/layer.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef LAYER_H
-#define LAYER_H
-
-enum area_layer_id {
-	AREA_LAYER_BOT = 0,
-	AREA_LAYER_MID,
-	AREA_LAYER_TOP,
-	AREA_LAYERS_MAX
-};
-
-#endif
--
cgit v0.9.1