summaryrefslogtreecommitdiffhomepage
path: root/loader/scenery.cpp
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2024-02-13 07:02:14 +0100
committerStanislaw Halik <sthalik@misaki.pl>2024-02-13 07:02:14 +0100
commit9b70fb78e70a509ba5bfa1c1d0a839eddd0902dc (patch)
tree8b662923591c273e8761787d3e74f3b659606c07 /loader/scenery.cpp
parent985ce7d9b033d16f49170af8505af46ddcf29081 (diff)
wip atlas
Diffstat (limited to 'loader/scenery.cpp')
-rw-r--r--loader/scenery.cpp14
1 files changed, 2 insertions, 12 deletions
diff --git a/loader/scenery.cpp b/loader/scenery.cpp
index 879e72d9..6fbaba45 100644
--- a/loader/scenery.cpp
+++ b/loader/scenery.cpp
@@ -2,23 +2,13 @@
#include "compat/assert.hpp"
#include "compat/exception.hpp"
#include "src/ground-atlas.hpp"
-#include "serialize/json-helper.hpp"
-#include "serialize/anim.hpp"
#include "serialize/scenery.hpp"
#include "scenery-cell.hpp"
+#include "serialize/json-helper.hpp"
#include "loader/anim-cell.hpp"
#include <Corrade/Containers/ArrayViewStl.h>
#include <Corrade/Utility/Path.h>
-namespace floormat {
-
-anim_def loader_::deserialize_anim_def(StringView filename) noexcept(false)
-{
- return json_helper::from_json<anim_def>(filename);
-}
-
-} // namespace floormat
-
namespace floormat::loader_detail {
void loader_impl::get_scenery_list()
@@ -38,7 +28,7 @@ void loader_impl::get_scenery_list()
sceneries_map.clear();
sceneries_map.reserve(sceneries_array.size() * 2);
- for (const scenery_cell& s : sceneries_array)
+ for (scenery_cell& s : sceneries_array)
{
if (sceneries_map.contains(s.name))
fm_abort("duplicate scenery name '%s'", s.name.data());