diff options
| author | P. J. McDermott <pjm@nac.net> | 2013-02-19 14:18:26 (EST) |
|---|---|---|
| committer | P. J. McDermott <pjm@nac.net> | 2013-02-19 14:18:26 (EST) |
| commit | 8a133b5f181e7b6e7f89e5d9f1a362e8ad87e3ad (patch) | |
| tree | eaa7a652a6607873f686e7be3a09c7e5535559f8 | |
| parent | fca5b26c8cdce0060d700186d42bacfe7ebc3d80 (diff) | |
| download | overworld-rpg-8a133b5f181e7b6e7f89e5d9f1a362e8ad87e3ad.zip overworld-rpg-8a133b5f181e7b6e7f89e5d9f1a362e8ad87e3ad.tar.gz overworld-rpg-8a133b5f181e7b6e7f89e5d9f1a362e8ad87e3ad.tar.bz2 | |
Merge src/layer.h into src/area.h.
| -rw-r--r-- | src/area.c | 1 | ||||
| -rw-r--r-- | src/area.h | 7 | ||||
| -rw-r--r-- | src/layer.h | 11 |
3 files changed, 6 insertions, 13 deletions
@@ -1,6 +1,5 @@ #include <SDL.h> #include "area.h" -#include "layer.h" #include "viewport.h" #include "resources/map.h" #include "logging.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 |