summaryrefslogtreecommitdiffstats
path: root/src/resources/map.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/resources/map.h')
-rw-r--r--src/resources/map.h18
1 files changed, 1 insertions, 17 deletions
diff --git a/src/resources/map.h b/src/resources/map.h
index 3341aaf..73f004e 100644
--- a/src/resources/map.h
+++ b/src/resources/map.h
@@ -21,8 +21,8 @@
#include <SDL_stdinc.h>
#include "resource.h"
+#include "tileset.h"
#include "palette.h"
-#include "image.h"
enum map_palette_id {
MAP_PALETTE_DEFAULT = 0,
@@ -45,22 +45,6 @@ struct map_palette {
struct palette *palette;
Uint16 min;
};
-struct tileset {
- struct resource res;
- char *dirname;
- char *name;
- int tilewidth;
- int tileheight;
- int width;
- int height;
- enum {
- TILESET_TYPE_IMAGE,
- TILESET_TYPE_COLLISION
- } type;
- struct image *image;
- Uint8 *collision_tiles;
- int cur_collision_tile;
-};
struct map_tileset {
struct tileset *tileset;
Uint32 firstgid;