diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2024-02-25 07:11:10 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2024-02-25 07:11:10 +0100 |
| commit | 7645616583a205e6d93c4531dfdafbff699068e7 (patch) | |
| tree | 941d1384625aea2443b88ee96f9c95bc66f79b20 /serialize | |
| parent | fbf24f274c81b260fb3d6689cd13086176f549a2 (diff) | |
cleanup includes
Diffstat (limited to 'serialize')
| -rw-r--r-- | serialize/wall-atlas.cpp | 6 | ||||
| -rw-r--r-- | serialize/wall-atlas.hpp | 1 |
2 files changed, 2 insertions, 5 deletions
diff --git a/serialize/wall-atlas.cpp b/serialize/wall-atlas.cpp index b2e7c2f5..4e661674 100644 --- a/serialize/wall-atlas.cpp +++ b/serialize/wall-atlas.cpp @@ -45,7 +45,7 @@ struct direction_triple { Array<Direction> array; std::array<DirArrayIndex, Direction_COUNT> map; - std::bitset<Direction_COUNT> mask; + std::array<bool, Direction_COUNT> mask; }; direction_triple read_all_directions(const json& jroot) @@ -54,9 +54,7 @@ direction_triple read_all_directions(const json& jroot) for (auto [str, _] : wall_atlas::directions) if (jroot.contains(str)) count++; - direction_triple ret = { Array<Direction>{count}, - std::array<DirArrayIndex, Direction_COUNT>{}, - std::bitset<Direction_COUNT>{0}, }; + direction_triple ret = { Array<Direction>{count}, {}, {}, }; auto& [array, map, mask] = ret; for (uint8_t i = 0, pos = 0; i < std::size(wall_atlas::directions); i++) { diff --git a/serialize/wall-atlas.hpp b/serialize/wall-atlas.hpp index 1381591d..5ce61c74 100644 --- a/serialize/wall-atlas.hpp +++ b/serialize/wall-atlas.hpp @@ -1,6 +1,5 @@ #pragma once #include "src/wall-atlas.hpp" -#include <bitset> #include <memory> #include <Corrade/Containers/Array.h> #include <nlohmann/json_fwd.hpp> |