summaryrefslogtreecommitdiffstats
path: root/src/resources/map.h
diff options
context:
space:
mode:
authorP. J. McDermott <pjm@nac.net>2013-11-18 03:13:38 (EST)
committer P. J. McDermott <pjm@nac.net>2013-11-18 03:13:38 (EST)
commit4c07bd8b98a3ac0dd9422a36f63c109b28d28ab5 (patch)
treeb8f465df57f009f0383e32e414b9dd3d703f22bb /src/resources/map.h
parent7ec94ed7c6803ae75d73e2a9ec7e54eaa2a97379 (diff)
downloadoverworld-rpg-4c07bd8b98a3ac0dd9422a36f63c109b28d28ab5.zip
overworld-rpg-4c07bd8b98a3ac0dd9422a36f63c109b28d28ab5.tar.gz
overworld-rpg-4c07bd8b98a3ac0dd9422a36f63c109b28d28ab5.tar.bz2
Split up src/resources/map.c.
src/resources/map.c defines map parsing functions. src/resources/tileset.c defines tileset (internal or external) parsing functions. src/resources/tmx.c defines common parsing functions. Also, tileset_get() is now non-static.
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;