diff options
author | Stanislaw Halik <sthalik@misaki.pl> | 2022-11-07 11:25:06 +0100 |
---|---|---|
committer | Stanislaw Halik <sthalik@misaki.pl> | 2022-11-07 11:25:06 +0100 |
commit | ee719a7c12733e5f4507227ee8f0fd50b9727a31 (patch) | |
tree | 355db9c89ec35438635dffd267bb4192261a5f14 /src | |
parent | cb490241da4b8306c1bd3d9c9ac299618ed5d346 (diff) |
more std::string
Diffstat (limited to 'src')
-rw-r--r-- | src/anim-atlas.cpp | 1 | ||||
-rw-r--r-- | src/anim-atlas.hpp | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/anim-atlas.cpp b/src/anim-atlas.cpp index 6fb4a3c0..116518d5 100644 --- a/src/anim-atlas.cpp +++ b/src/anim-atlas.cpp @@ -1,7 +1,6 @@ #include "anim-atlas.hpp" #include "compat/assert.hpp" #include "shaders/tile.hpp" -#include <Corrade/Containers/StringStlView.h> #include <Magnum/Math/Color.h> #include <Magnum/GL/TextureFormat.h> diff --git a/src/anim-atlas.hpp b/src/anim-atlas.hpp index 16e4825d..c54cf373 100644 --- a/src/anim-atlas.hpp +++ b/src/anim-atlas.hpp @@ -3,7 +3,7 @@ #include "scenery.hpp" #include "serialize/anim.hpp" #include <array> -#include <Corrade/Containers/String.h> +#include <string> #include <Magnum/Math/Vector2.h> #include <Magnum/ImageView.h> #include <Magnum/GL/Texture.h> @@ -40,7 +40,7 @@ struct anim_atlas final private: GL::Texture2D _tex; - String _name; + std::string _name; anim_info _info; std::array<std::uint8_t, (std::size_t)rotation::COUNT> _group_indices = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, |