diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/anim.hpp | 1 | ||||
| -rw-r--r-- | src/precomp.hpp | 1 | ||||
| -rw-r--r-- | src/random.hpp | 4 | ||||
| -rw-r--r-- | src/scenery.hpp | 2 | ||||
| -rw-r--r-- | src/tile-defs.hpp | 4 | ||||
| -rw-r--r-- | src/tile-image.hpp | 2 | ||||
| -rw-r--r-- | src/tile-iterator.hpp | 4 | ||||
| -rw-r--r-- | src/tile.hpp | 3 | ||||
| -rw-r--r-- | src/world.hpp | 3 |
9 files changed, 13 insertions, 11 deletions
diff --git a/src/anim.hpp b/src/anim.hpp index 447c0410..1a4011dc 100644 --- a/src/anim.hpp +++ b/src/anim.hpp @@ -1,6 +1,5 @@ #pragma once -#include "compat/integer-types.hpp" #include <vector> #include <Corrade/Containers/String.h> #include <Magnum/Magnum.h> diff --git a/src/precomp.hpp b/src/precomp.hpp index bdd5a380..4808d6a2 100644 --- a/src/precomp.hpp +++ b/src/precomp.hpp @@ -1,6 +1,5 @@ #pragma once -#include "compat/integer-types.hpp" #include "compat/defs.hpp" #include "compat/assert.hpp" #include "compat/alloca.hpp" diff --git a/src/random.hpp b/src/random.hpp index 5b6dc6a9..e8e462e8 100644 --- a/src/random.hpp +++ b/src/random.hpp @@ -1,5 +1,7 @@ #pragma once -#include "compat/integer-types.hpp" + +#include <cstddef> +#include <cstdint> #include <concepts> #include <type_traits> diff --git a/src/scenery.hpp b/src/scenery.hpp index 5056a22e..3e7c4e4f 100644 --- a/src/scenery.hpp +++ b/src/scenery.hpp @@ -1,5 +1,5 @@ #pragma once -#include "compat/integer-types.hpp" +#include <cstdint> #include <memory> namespace floormat { diff --git a/src/tile-defs.hpp b/src/tile-defs.hpp index af0b0194..f40e81ff 100644 --- a/src/tile-defs.hpp +++ b/src/tile-defs.hpp @@ -1,10 +1,10 @@ #pragma once -#include "compat/integer-types.hpp" +#include <cstddef> #include <Magnum/Math/Vector3.h> namespace floormat { -constexpr inline std::uint8_t TILE_MAX_DIM = 16; +constexpr inline unsigned char TILE_MAX_DIM = 16; constexpr inline std::size_t TILE_COUNT = TILE_MAX_DIM*TILE_MAX_DIM; constexpr inline auto TILE_MAX_DIM20d = Magnum::Math::Vector3<double> { TILE_MAX_DIM, TILE_MAX_DIM, 0 }; diff --git a/src/tile-image.hpp b/src/tile-image.hpp index 2ecfd6d7..f1db9a5e 100644 --- a/src/tile-image.hpp +++ b/src/tile-image.hpp @@ -1,5 +1,5 @@ #pragma once -#include "compat/integer-types.hpp" +#include <cstdint> #include <memory> namespace floormat { diff --git a/src/tile-iterator.hpp b/src/tile-iterator.hpp index 6403b53a..f5f717f6 100644 --- a/src/tile-iterator.hpp +++ b/src/tile-iterator.hpp @@ -1,9 +1,11 @@ #pragma once -#include "compat/integer-types.hpp" #include "local-coords.hpp" #include "tile.hpp" +#include <cstddef> +#include <iterator> + namespace floormat { struct tile_iterator_tuple final { // NOLINT(cppcoreguidelines-pro-type-member-init) diff --git a/src/tile.hpp b/src/tile.hpp index 6fad4b30..dc635da6 100644 --- a/src/tile.hpp +++ b/src/tile.hpp @@ -1,5 +1,4 @@ #pragma once -#include "compat/defs.hpp" #include "tile-image.hpp" #include "scenery.hpp" @@ -9,7 +8,7 @@ struct chunk; struct anim_atlas; // zero is the default, see bitset in chunk.hpp -enum pass_mode : std::uint8_t { pass_shoot_through, pass_ok, pass_blocked, }; +enum pass_mode : unsigned char { pass_shoot_through, pass_ok, pass_blocked, }; struct pass_mode_ref final { diff --git a/src/world.hpp b/src/world.hpp index 248f9dc4..69710bb6 100644 --- a/src/world.hpp +++ b/src/world.hpp @@ -1,8 +1,9 @@ #pragma once #include "compat/int-hash.hpp" -#include "compat/integer-types.hpp" +#include "compat/defs.hpp" #include "chunk.hpp" #include "global-coords.hpp" +#include <cstddef> #include <unordered_map> #include <memory> |