diff options
Diffstat (limited to 'loader')
| -rw-r--r-- | loader/anim-atlas.cpp | 2 | ||||
| -rw-r--r-- | loader/anim-traits.cpp | 1 | ||||
| -rw-r--r-- | loader/ground-atlas.cpp | 2 | ||||
| -rw-r--r-- | loader/ground-cell.cpp | 1 | ||||
| -rw-r--r-- | loader/ground-traits.cpp | 1 | ||||
| -rw-r--r-- | loader/impl.cpp | 2 | ||||
| -rw-r--r-- | loader/vobj.cpp | 1 | ||||
| -rw-r--r-- | loader/wall-atlas.cpp | 1 | ||||
| -rw-r--r-- | loader/wall-cell.cpp | 2 | ||||
| -rw-r--r-- | loader/wall-traits.cpp | 1 |
10 files changed, 3 insertions, 11 deletions
diff --git a/loader/anim-atlas.cpp b/loader/anim-atlas.cpp index cfbe7245..eef5f647 100644 --- a/loader/anim-atlas.cpp +++ b/loader/anim-atlas.cpp @@ -2,7 +2,7 @@ #include "atlas-loader.inl" #include "anim-cell.hpp" #include "anim-traits.hpp" -#include "compat/borrowed-ptr.inl" +#include "compat/borrowed-ptr.hpp" namespace floormat::loader_detail { diff --git a/loader/anim-traits.cpp b/loader/anim-traits.cpp index 09da71e8..8a701979 100644 --- a/loader/anim-traits.cpp +++ b/loader/anim-traits.cpp @@ -7,7 +7,6 @@ #include "serialize/json-helper.hpp" #include "serialize/anim.hpp" #include "compat/exception.hpp" -#include "compat/borrowed-ptr.inl" #include <cr/StringView.h> #include <cr/GrowableArray.h> #include <cr/StridedArrayView.h> diff --git a/loader/ground-atlas.cpp b/loader/ground-atlas.cpp index 4b3495a0..fc756395 100644 --- a/loader/ground-atlas.cpp +++ b/loader/ground-atlas.cpp @@ -2,7 +2,7 @@ #include "atlas-loader.inl" #include "ground-traits.hpp" #include "ground-cell.hpp" -#include "compat/borrowed-ptr.inl" +#include "compat/borrowed-ptr.hpp" #include <Magnum/Math/Vector2.h> namespace floormat::loader_detail { diff --git a/loader/ground-cell.cpp b/loader/ground-cell.cpp index 33696cd6..21982bd0 100644 --- a/loader/ground-cell.cpp +++ b/loader/ground-cell.cpp @@ -4,7 +4,6 @@ //#include "serialize/corrade-string.hpp" #include "serialize/ground-atlas.hpp" #include "serialize/corrade-array.hpp" -#include "compat/borrowed-ptr.inl" #include <cr/Array.h> namespace floormat { diff --git a/loader/ground-traits.cpp b/loader/ground-traits.cpp index 3061ef4c..611d4265 100644 --- a/loader/ground-traits.cpp +++ b/loader/ground-traits.cpp @@ -5,7 +5,6 @@ #include "src/tile-defs.hpp" #include "src/ground-atlas.hpp" #include "compat/assert.hpp" -#include "compat/borrowed-ptr.inl" #include <cr/Optional.h> #include <Corrade/Containers/StringView.h> #include <Corrade/Containers/Pointer.h> diff --git a/loader/impl.cpp b/loader/impl.cpp index 86bd76d5..ce5ad1a8 100644 --- a/loader/impl.cpp +++ b/loader/impl.cpp @@ -1,6 +1,5 @@ #include "impl.hpp" #include "compat/assert.hpp" -#include "compat/borrowed-ptr.inl" #include "ground-traits.hpp" #include "ground-cell.hpp" #include "wall-traits.hpp" @@ -9,7 +8,6 @@ #include "anim-cell.hpp" #include "scenery-traits.hpp" #include "scenery-cell.hpp" -// todo scenery_traits #include "vobj-cell.hpp" #include "atlas-loader.hpp" #include "atlas-loader-storage.hpp" diff --git a/loader/vobj.cpp b/loader/vobj.cpp index 789854a4..ebc35b16 100644 --- a/loader/vobj.cpp +++ b/loader/vobj.cpp @@ -4,7 +4,6 @@ #include "src/anim-atlas.hpp" #include "src/anim.hpp" #include "compat/exception.hpp" -#include "compat/borrowed-ptr.inl" #include "loader/vobj-cell.hpp" #include <Corrade/Containers/ArrayViewStl.h> #include <Corrade/Containers/StridedArrayView.h> diff --git a/loader/wall-atlas.cpp b/loader/wall-atlas.cpp index dbf71c47..b8db913f 100644 --- a/loader/wall-atlas.cpp +++ b/loader/wall-atlas.cpp @@ -3,7 +3,6 @@ #include "loader/wall-cell.hpp" #include "loader/wall-traits.hpp" #include "loader/atlas-loader.inl" -#include "compat/borrowed-ptr.inl" #include <Corrade/Containers/Array.h> #include <Corrade/Containers/StringIterable.h> #include <Magnum/Trade/ImageData.h> diff --git a/loader/wall-cell.cpp b/loader/wall-cell.cpp index a385163b..eff497af 100644 --- a/loader/wall-cell.cpp +++ b/loader/wall-cell.cpp @@ -1,6 +1,6 @@ #include "wall-cell.hpp" #include "compat/exception.hpp" -#include "compat/borrowed-ptr.inl" +#include "compat/borrowed-ptr.hpp" #include "serialize/json-helper.hpp" #include "serialize/corrade-string.hpp" #include "serialize/corrade-array.hpp" diff --git a/loader/wall-traits.cpp b/loader/wall-traits.cpp index e5cd7f40..7a50d105 100644 --- a/loader/wall-traits.cpp +++ b/loader/wall-traits.cpp @@ -6,7 +6,6 @@ #include "src/wall-atlas.hpp" #include "compat/array-size.hpp" #include "compat/exception.hpp" -#include "compat/borrowed-ptr.inl" #include <cr/StringView.h> #include <cr/Optional.h> #include <mg/ImageData.h> |