diff options
author | Stanislaw Halik <sthalik@misaki.pl> | 2024-01-11 14:29:53 +0100 |
---|---|---|
committer | Stanislaw Halik <sthalik@misaki.pl> | 2024-01-11 14:45:29 +0100 |
commit | d74df1b763979d281f76f3f30543aee8d8a638b7 (patch) | |
tree | 08939a34160b261c37644595aa8702dd0689d74f /loader/loader.hpp | |
parent | 7867213a01fcabb1f05b1836c2ca59dc3bb2132f (diff) |
rename floor -> ground
Diffstat (limited to 'loader/loader.hpp')
-rw-r--r-- | loader/loader.hpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/loader/loader.hpp b/loader/loader.hpp index 63b5ea5c..fc58e61a 100644 --- a/loader/loader.hpp +++ b/loader/loader.hpp @@ -23,11 +23,12 @@ struct wall_info; struct loader_ { virtual StringView shader(StringView filename) noexcept = 0; - virtual Trade::ImageData2D texture(StringView prefix, StringView filename, bool fail_ok = true) noexcept(false) = 0; + virtual Trade::ImageData2D texture(StringView prefix, StringView filename) noexcept(false) = 0; virtual std::shared_ptr<class ground_atlas> ground_atlas(StringView filename, Vector2ub size, pass_mode pass) noexcept(false) = 0; - virtual std::shared_ptr<class ground_atlas> ground_atlas(StringView filename) noexcept(false) = 0; + virtual std::shared_ptr<class ground_atlas> ground_atlas(StringView filename, bool fail_ok = false) noexcept(false) = 0; virtual ArrayView<const String> anim_atlas_list() = 0; virtual std::shared_ptr<class anim_atlas> anim_atlas(StringView name, StringView dir = ANIM_PATH) noexcept(false) = 0; + virtual const wall_info& make_invalid_wall_atlas() noexcept = 0; virtual std::shared_ptr<class wall_atlas> wall_atlas(StringView name, bool fail_ok = true) noexcept(false) = 0; virtual ArrayView<const wall_info> wall_atlas_list() = 0; static void destroy(); @@ -47,11 +48,12 @@ struct loader_ virtual ~loader_() noexcept; - static const StringView IMAGE_PATH; + static const StringView IMAGE_PATH_; static const StringView ANIM_PATH; static const StringView SCENERY_PATH; static const StringView TEMP_PATH; static const StringView VOBJ_PATH; + static const StringView GROUND_TILESET_PATH; static const StringView WALL_TILESET_PATH; protected: |