diff options
-rw-r--r-- | loader/impl.cpp | 3 | ||||
-rw-r--r-- | loader/impl.hpp | 4 | ||||
-rw-r--r-- | serialize/savegame.cpp | 11 |
3 files changed, 10 insertions, 8 deletions
diff --git a/loader/impl.cpp b/loader/impl.cpp index 39256c52..86e79109 100644 --- a/loader/impl.cpp +++ b/loader/impl.cpp @@ -8,6 +8,9 @@ // wall #include "wall-traits.hpp" #include "wall-cell.hpp" +// todo scenery_traits +#include "anim-cell.hpp" +#include "scenery.hpp" #include "vobj-cell.hpp" #include "atlas-loader.hpp" #include "atlas-loader-storage.hpp" diff --git a/loader/impl.hpp b/loader/impl.hpp index 1c757c05..3520d91b 100644 --- a/loader/impl.hpp +++ b/loader/impl.hpp @@ -50,8 +50,8 @@ struct loader_impl final : loader_ const wall_cell& make_invalid_wall_atlas() override; // >-----> ground >-----> - static atlas_loader<class ground_atlas>* make_ground_atlas_loader(); - safe_ptr<atlas_loader<class ground_atlas>> _ground_loader{make_ground_atlas_loader()}; + [[nodiscard]] static atlas_loader<class ground_atlas>* make_ground_atlas_loader(); + safe_ptr<atlas_loader<class ground_atlas>> _ground_loader{ make_ground_atlas_loader() }; const std::shared_ptr<class ground_atlas>& ground_atlas(StringView filename, loader_policy policy) noexcept(false) override; ArrayView<const ground_cell> ground_atlas_list() noexcept(false) override; const ground_cell& make_invalid_ground_atlas() override; diff --git a/serialize/savegame.cpp b/serialize/savegame.cpp index e54b0067..a1aae8bf 100644 --- a/serialize/savegame.cpp +++ b/serialize/savegame.cpp @@ -6,18 +6,17 @@ #include "compat/int-hash.hpp" #include "compat/exception.hpp" -#include "src/world.hpp" -#include "loader/loader.hpp" - -#include "atlas-type.hpp" -#include "src/anim-atlas.hpp" #include "src/ground-atlas.hpp" #include "src/wall-atlas.hpp" - +#include "src/anim-atlas.hpp" #include "src/scenery.hpp" #include "src/critter.hpp" #include "src/light.hpp" +#include "src/world.hpp" + +#include "loader/loader.hpp" #include "loader/vobj-cell.hpp" +#include "atlas-type.hpp" #include <cstring> #include <cstdio> |