diff options
author | P. J. McDermott <pjm@nac.net> | 2013-02-18 20:40:16 (EST) |
---|---|---|
committer | P. J. McDermott <pjm@nac.net> | 2013-02-18 20:40:16 (EST) |
commit | a1fabc10623b9e9a4177e8e0344d5edccdcf60b7 (patch) | |
tree | 3543c67136fd2b9c11e7977dc023dbb3d57a1543 /src/resources | |
parent | 3cb3379babb7a14ad0bee6f977816ea3818714b9 (diff) | |
download | overworld-rpg-a1fabc10623b9e9a4177e8e0344d5edccdcf60b7.zip overworld-rpg-a1fabc10623b9e9a4177e8e0344d5edccdcf60b7.tar.gz overworld-rpg-a1fabc10623b9e9a4177e8e0344d5edccdcf60b7.tar.bz2 |
Make the tileset firstgid a Uint32.
Diffstat (limited to 'src/resources')
-rw-r--r-- | src/resources/map.c | 5 | ||||
-rw-r--r-- | src/resources/map.h | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/resources/map.c b/src/resources/map.c index 3fbf12e..0719a14 100644 --- a/src/resources/map.c +++ b/src/resources/map.c @@ -119,7 +119,7 @@ map_get(const char *path) } void -map_add_tileset(struct map *m, struct tileset *t, int firstgid) +map_add_tileset(struct map *m, struct tileset *t, Uint32 firstgid) { struct map_tileset *mts; @@ -345,7 +345,8 @@ tmx_map_el_start(void *pv, const char *name, const char **attr) xml_node_push(p, ts, tmx_tileset_el_start, tmx_tilesetemb_end, NULL); } - xml_get_int_attr(p, attr, "firstgid", &m->cur_ts_firstgid, 1); + xml_get_uint32_attr(p, attr, "firstgid", &m->cur_ts_firstgid, + 1); } else if (xml_check_tag(name, "layer")) { ly_name = NULL; xml_get_string_attr(p, attr, "name", &ly_name, 1); diff --git a/src/resources/map.h b/src/resources/map.h index 6d1d789..267eb30 100644 --- a/src/resources/map.h +++ b/src/resources/map.h @@ -32,7 +32,7 @@ struct tileset { }; struct map_tileset { struct tileset *tileset; - int firstgid; + Uint32 firstgid; struct map_tileset *next; }; struct layer { @@ -92,12 +92,12 @@ struct map { struct map_collision *collisions; struct map_exit *map_exits_head; struct map_exit *map_exits_tail; - int cur_ts_firstgid; + Uint32 cur_ts_firstgid; }; struct map *map_get(const char *path); void map_free(struct map *map); -void map_add_tileset(struct map *m, struct tileset *t, int firstgid); +void map_add_tileset(struct map *m, struct tileset *t, Uint32 firstgid); struct layer *map_get_layer(struct map *m, const char *name); void map_add_exit(struct map *m, struct map_exit *e); |