Mercurial > molko
diff tests/test-map.c @ 211:adcbb7ccfdee
rpg: some refactoring
Rename map tile properties into `map_tiledef` and refactor a bit functions to
reduce code duplication.
Also add more sane collisions in the test map.
| author | David Demelier <markand@malikania.fr> |
|---|---|
| date | Sun, 15 Nov 2020 21:47:49 +0100 |
| parents | 70e6ed74940d |
| children | 64f24b482722 |
line wrap: on
line diff
--- a/tests/test-map.c Sat Nov 14 16:59:11 2020 +0100 +++ b/tests/test-map.c Sun Nov 15 21:47:49 2020 +0100 @@ -48,17 +48,17 @@ GREATEST_ASSERT_EQ(5, map.layers[1].tiles[1]); GREATEST_ASSERT_EQ(6, map.layers[1].tiles[2]); GREATEST_ASSERT_EQ(7, map.layers[1].tiles[3]); - GREATEST_ASSERT_EQ(2, map.tilesz); - GREATEST_ASSERT_EQ(0, map.tiles[0].id); - GREATEST_ASSERT_EQ(10, map.tiles[0].x); - GREATEST_ASSERT_EQ(12, map.tiles[0].y); - GREATEST_ASSERT_EQ(5, map.tiles[0].w); - GREATEST_ASSERT_EQ(7, map.tiles[0].h); - GREATEST_ASSERT_EQ(2, map.tiles[1].id); - GREATEST_ASSERT_EQ(12, map.tiles[1].x); - GREATEST_ASSERT_EQ(14, map.tiles[1].y); - GREATEST_ASSERT_EQ(8, map.tiles[1].w); - GREATEST_ASSERT_EQ(10, map.tiles[1].h); + GREATEST_ASSERT_EQ(2, map.tiledefsz); + GREATEST_ASSERT_EQ(0, map.tiledefs[0].id); + GREATEST_ASSERT_EQ(10, map.tiledefs[0].x); + GREATEST_ASSERT_EQ(12, map.tiledefs[0].y); + GREATEST_ASSERT_EQ(5, map.tiledefs[0].w); + GREATEST_ASSERT_EQ(7, map.tiledefs[0].h); + GREATEST_ASSERT_EQ(2, map.tiledefs[1].id); + GREATEST_ASSERT_EQ(12, map.tiledefs[1].x); + GREATEST_ASSERT_EQ(14, map.tiledefs[1].y); + GREATEST_ASSERT_EQ(8, map.tiledefs[1].w); + GREATEST_ASSERT_EQ(10, map.tiledefs[1].h); map_finish(&map); map_file_finish(&loader);