c

6 files changed, 7 insertions, 20 deletions

diff --git a/editor/vobj-editor.cpp b/editor/vobj-editor.cpp
index e5046e61..61eb0de7 100644
--- a/editor/vobj-editor.cpp
+++ b/editor/vobj-editor.cpp
@@ -1,5 +1,4 @@
 #include "vobj-editor.hpp"
-#include "loader/vobj-info.hpp"
 #include "loader/loader.hpp"
 #include "src/world.hpp"
 #include "src/light.hpp"
diff --git a/loader/impl.cpp b/loader/impl.cpp
index 0f15e74c..f2f3c669 100644
--- a/loader/impl.cpp
+++ b/loader/impl.cpp
@@ -1,7 +1,6 @@
 #include "impl.hpp"
 #include "compat/assert.hpp"
 #include "loader/scenery.hpp"
-#include "loader/vobj-info.hpp"
 #include "loader/wall-info.hpp"
 #include "src/ground-atlas.hpp"
 #include <Corrade/Containers/Pair.h>
diff --git a/loader/loader.hpp b/loader/loader.hpp
index cc519765..477a5dd0 100644
--- a/loader/loader.hpp
+++ b/loader/loader.hpp
@@ -2,7 +2,7 @@
 #include "src/pass-mode.hpp"
 #include <stdio.h>
 #include <memory>
-#include <Corrade/Containers/StringView.h>
+#include <Corrade/Containers/String.h>
 
 namespace Magnum { using Vector2ub = Math::Vector2<unsigned char>; }
 namespace floormat { struct serialized_scenery; }
@@ -21,6 +21,12 @@ struct ground_info;
 struct wall_info;
 class wall_atlas;
 
+struct vobj_info final
+{
+    String name, descr;
+    std::shared_ptr<anim_atlas> atlas;
+};
+
 struct loader_
 {
     virtual StringView shader(StringView filename) noexcept = 0;
diff --git a/loader/vobj-info.hpp b/loader/vobj-info.hpp
deleted file mode 100644
index 75ace811..00000000
--- a/loader/vobj-info.hpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma once
-#include <memory>
-#include <Corrade/Containers/String.h>
-
-namespace floormat {
-
-class anim_atlas;
-
-struct vobj_info final
-{
-    String name, descr;
-    std::shared_ptr<anim_atlas> atlas;
-};
-
-} // namespace floormat
diff --git a/loader/vobj.cpp b/loader/vobj.cpp
index ca6a2e63..637ba776 100644
--- a/loader/vobj.cpp
+++ b/loader/vobj.cpp
@@ -1,5 +1,4 @@
 #include "impl.hpp"
-#include "loader/vobj-info.hpp"
 #include "serialize/json-helper.hpp"
 #include "serialize/corrade-string.hpp"
 #include "src/anim-atlas.hpp"
diff --git a/src/light.cpp b/src/light.cpp
index 4a240f29..ec4a5cb1 100644
--- a/src/light.cpp
+++ b/src/light.cpp
@@ -1,7 +1,6 @@
 #include "light.hpp"
 #include "shaders/shader.hpp"
 #include "loader/loader.hpp"
-#include "loader/vobj-info.hpp"
 #include <cmath>
 
 namespace floormat {