w

1 files changed, 11 insertions, 13 deletions

diff --git a/loader/impl.hpp b/loader/impl.hpp
index ad82e46d..0b718527 100644
--- a/loader/impl.hpp
+++ b/loader/impl.hpp
@@ -13,6 +13,7 @@
 namespace floormat {
 struct anim_def;
 struct wall_info;
+struct ground_info;
 }
 
 namespace floormat::loader_detail {
@@ -45,31 +46,30 @@ struct loader_impl final : loader_
     Trade::ImageData2D texture(StringView prefix, StringView filename) noexcept(false) override;
 
     // >-----> walls >----->
-    struct wall_index { uint32_t val = (uint32_t)-1; };
     tsl::robin_map<StringView, wall_info*> wall_atlas_map;
     std::vector<wall_info> wall_atlas_array;
     std::vector<String> missing_wall_atlases;
-
     Pointer<wall_info> invalid_wall_atlas;
-
     std::shared_ptr<class wall_atlas> wall_atlas(StringView name, bool fail_ok = true) override;
     ArrayView<const wall_info> wall_atlas_list() override;
     void get_wall_atlas_list();
-    const wall_info& make_invalid_wall_atlas() noexcept override;
-    std::shared_ptr<class wall_atlas> get_wall_atlas(StringView name, StringView path);
+    const wall_info& make_invalid_wall_atlas();
+    std::shared_ptr<class wall_atlas> get_wall_atlas(StringView name, StringView dir);
 
     // >-----> tile >----->
-    tsl::robin_map<StringView, std::shared_ptr<class ground_atlas>> ground_atlas_map;
-    std::vector<std::shared_ptr<class ground_atlas>> ground_atlas_array;
-
-    ArrayView<const std::shared_ptr<class ground_atlas>> ground_atlases(StringView filename) noexcept(false) override;
-    std::shared_ptr<class ground_atlas> ground_atlas(StringView filename, Vector2ub size, pass_mode pass) noexcept(false) override;
+    tsl::robin_map<StringView, ground_info*> ground_atlas_map;
+    std::vector<ground_info> ground_atlas_array;
+    std::vector<String> missing_ground_atlases;
+    Pointer<ground_info> invalid_ground_atlas;
     std::shared_ptr<class ground_atlas> ground_atlas(StringView filename, bool fail_ok) noexcept(false) override;
+    ArrayView<const ground_info> ground_atlas_list() noexcept(false) override;
+    void get_ground_atlas_list();
+    const ground_info& make_invalid_ground_atlas();
+    std::shared_ptr<class ground_atlas> get_ground_atlas(StringView name, StringView path, Vector2ub size, pass_mode pass) noexcept(false) override;
 
     // >-----> anim >----->
     tsl::robin_map<StringView, std::shared_ptr<class anim_atlas>> anim_atlas_map;
     std::vector<String> anim_atlases;
-
     ArrayView<const String> anim_atlas_list() override;
     std::shared_ptr<class anim_atlas> anim_atlas(StringView name, StringView dir) noexcept(false) override;
     static anim_def deserialize_anim(StringView filename);
@@ -78,7 +78,6 @@ struct loader_impl final : loader_
     // >-----> scenery >----->
     std::vector<serialized_scenery> sceneries_array;
     tsl::robin_map<StringView, const serialized_scenery*> sceneries_map;
-
     ArrayView<const serialized_scenery> sceneries() override;
     const scenery_proto& scenery(StringView name) noexcept(false) override;
     void get_scenery_list();
@@ -86,7 +85,6 @@ struct loader_impl final : loader_
     // >-----> vobjs >----->
     tsl::robin_map<StringView, const struct vobj_info*> vobj_atlas_map;
     std::vector<struct vobj_info> vobjs;
-
     std::shared_ptr<class anim_atlas> make_vobj_anim_atlas(StringView name, StringView image_filename);
     const struct vobj_info& vobj(StringView name) override;
     ArrayView<const struct vobj_info> vobj_list() override;