diff options
| author | P. J. McDermott <pjm@nac.net> | 2013-02-17 16:39:25 (EST) |
|---|---|---|
| committer | P. J. McDermott <pjm@nac.net> | 2013-02-17 16:42:41 (EST) |
| commit | 12b4f785f2bfccce59eb80378a76bf36bef6ff55 (patch) | |
| tree | 69f202d5fe228b1589b7520eaa7eef0bd5ff0bd3 /src/resources/map.h | |
| parent | e5b4399a3cdbb259236e6d98896abc706fc93c1d (diff) | |
| download | overworld-rpg-12b4f785f2bfccce59eb80378a76bf36bef6ff55.zip overworld-rpg-12b4f785f2bfccce59eb80378a76bf36bef6ff55.tar.gz overworld-rpg-12b4f785f2bfccce59eb80378a76bf36bef6ff55.tar.bz2 | |
Add map exits to a collisions array.
Diffstat (limited to 'src/resources/map.h')
| -rw-r--r-- | src/resources/map.h | 15 |
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; |