diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/dijkstra.cpp | 2 | ||||
| -rw-r--r-- | test/json.cpp | 4 | ||||
| -rw-r--r-- | test/loader.cpp | 12 | ||||
| -rw-r--r-- | test/path-search.cpp | 2 | ||||
| -rw-r--r-- | test/raycast.cpp | 4 | ||||
| -rw-r--r-- | test/wall-atlas2.cpp | 4 |
6 files changed, 14 insertions, 14 deletions
diff --git a/test/dijkstra.cpp b/test/dijkstra.cpp index 6b2eafd4..63a932d9 100644 --- a/test/dijkstra.cpp +++ b/test/dijkstra.cpp @@ -20,7 +20,7 @@ void test_app::test_dijkstra() constexpr auto wpos = global_coords{wch, wt}; auto& ch = w[wch]; - auto wall = wall_image_proto{loader.make_invalid_wall_atlas().atlas, 0}; + auto wall = wall_image_proto{loader.invalid_wall_atlas().atlas, 0}; for (int16_t j = wcy - 1; j <= wcy + 1; j++) for (int16_t i = wcx - 1; i <= wcx + 1; i++) diff --git a/test/json.cpp b/test/json.cpp index aac6fdee..5733c691 100644 --- a/test/json.cpp +++ b/test/json.cpp @@ -39,9 +39,9 @@ void test_app::test_json2() { fm_assert(Path::exists(Path::join(loader.TEMP_PATH, "CMakeCache.txt"))); const auto output_dir = Path::join(loader.TEMP_PATH, "test/."_s); - auto atlas1 = loader.make_invalid_ground_atlas().atlas; + auto atlas1 = loader.invalid_ground_atlas().atlas; json_helper::to_json(atlas1, Path::join(output_dir, "atlas1.json")); - auto atlas2 = loader.make_invalid_wall_atlas().atlas; + auto atlas2 = loader.invalid_wall_atlas().atlas; atlas2->serialize(Path::join(output_dir, "atlas2.json")); } diff --git a/test/loader.cpp b/test/loader.cpp index 01792bd6..b36ca0ca 100644 --- a/test/loader.cpp +++ b/test/loader.cpp @@ -41,13 +41,13 @@ constexpr const char* anim_atlases[] = { void test_app::test_loader() { - fm_assert(loader.make_invalid_ground_atlas().atlas); - fm_assert(&loader.make_invalid_ground_atlas().atlas == &loader.make_invalid_ground_atlas().atlas); - fm_assert(loader.make_invalid_ground_atlas().name == loader.INVALID); + fm_assert(loader.invalid_ground_atlas().atlas); + fm_assert(&loader.invalid_ground_atlas().atlas == &loader.invalid_ground_atlas().atlas); + fm_assert(loader.invalid_ground_atlas().name == loader.INVALID); - fm_assert(loader.make_invalid_wall_atlas().atlas); - fm_assert(&loader.make_invalid_wall_atlas().atlas == &loader.make_invalid_wall_atlas().atlas); - fm_assert(loader.make_invalid_wall_atlas().name == loader.INVALID); + fm_assert(loader.invalid_wall_atlas().atlas); + fm_assert(&loader.invalid_wall_atlas().atlas == &loader.invalid_wall_atlas().atlas); + fm_assert(loader.invalid_wall_atlas().name == loader.INVALID); for (const auto& str : anim_atlases) (void)loader.anim_atlas(str, {}); diff --git a/test/path-search.cpp b/test/path-search.cpp index f602a8b9..caaa55f2 100644 --- a/test/path-search.cpp +++ b/test/path-search.cpp @@ -179,7 +179,7 @@ void test_bbox() return neighbor_tiles(w, { ch, pos }, {}, (object_id)-1, path_search::never_continue()); }; - const auto wall = loader.make_invalid_wall_atlas().atlas; + const auto wall = loader.invalid_wall_atlas().atlas; const auto table = loader.scenery("table1"); { diff --git a/test/raycast.cpp b/test/raycast.cpp index 6e3880cd..c5ba7cfb 100644 --- a/test/raycast.cpp +++ b/test/raycast.cpp @@ -14,8 +14,8 @@ world make_world() { constexpr auto var = (variant_t)-1; #if 1 - auto wall1_ = loader.make_invalid_wall_atlas().atlas; - auto wall2_ = loader.make_invalid_wall_atlas().atlas; + auto wall1_ = loader.invalid_wall_atlas().atlas; + auto wall2_ = loader.invalid_wall_atlas().atlas; #else auto wall1_ = loader.wall_atlas("test1"_s); auto wall2_ = loader.wall_atlas("concrete1"_s); diff --git a/test/wall-atlas2.cpp b/test/wall-atlas2.cpp index f112c1c6..3faa306f 100644 --- a/test/wall-atlas2.cpp +++ b/test/wall-atlas2.cpp @@ -28,8 +28,8 @@ void test_loading() } else { - fm_assert(loader.make_invalid_wall_atlas().atlas); - fm_assert(x.atlas == loader.make_invalid_wall_atlas().atlas); + fm_assert(loader.invalid_wall_atlas().atlas); + fm_assert(x.atlas == loader.invalid_wall_atlas().atlas); } } } |