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.h15
1 files changed, 14 insertions, 1 deletions
diff --git a/src/resources/map.h b/src/resources/map.h
index bf225de..e088161 100644
--- a/src/resources/map.h
+++ b/src/resources/map.h
@@ -35,6 +35,19 @@ struct layer {
char *compression;
char *raw_data;
};
+struct map_collision {
+ enum {
+ COLLISION_NONE = 0,
+ COLLISION_CHAR,
+ COLLISION_OBJ,
+ COLLISION_EXIT
+ } type;
+ union {
+/* struct character *c;*/
+ Uint8 o;
+ struct map_exit *e;
+ } data;
+};
struct map_exit {
struct map *map;
int x;
@@ -69,7 +82,7 @@ struct map {
struct map_tileset *tilesets_head;
struct map_tileset *tilesets_tail;
struct layer layers[LAYERS_MAX];
- Uint8 *collision;
+ struct map_collision *collisions;
struct map_exit *map_exits_head;
struct map_exit *map_exits_tail;
int cur_ts_firstgid;