diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/anim-atlas.cpp | 8 | ||||
| -rw-r--r-- | src/wall-atlas.hpp | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/anim-atlas.cpp b/src/anim-atlas.cpp index 43ba69b2..ee05987f 100644 --- a/src/anim-atlas.cpp +++ b/src/anim-atlas.cpp @@ -11,12 +11,14 @@ namespace floormat { +namespace { +constexpr inline char name_array[][3] = { "n", "ne", "e", "se", "s", "sw", "w", "nw", }; +constexpr inline auto rot_count = size_t(rotation_COUNT); +} // namespace + template class bptr<anim_atlas>; template class bptr<const anim_atlas>; -static constexpr const char name_array[][3] = { "n", "ne", "e", "se", "s", "sw", "w", "nw", }; -static constexpr inline auto rot_count = size_t(rotation_COUNT); - static_assert(array_size(name_array) == rot_count); static_assert(rot_count == 8); diff --git a/src/wall-atlas.hpp b/src/wall-atlas.hpp index e0203165..52a1f96a 100644 --- a/src/wall-atlas.hpp +++ b/src/wall-atlas.hpp @@ -53,7 +53,7 @@ struct Direction bool operator==(const Direction&) const noexcept; - static constexpr inline member_tuple groups[] = { + static constexpr member_tuple groups[] = { { "wall"_s, &Direction::wall, Group_::wall }, { "side"_s, &Direction::side, Group_::side }, { "top"_s, &Direction::top, Group_::top }, @@ -61,7 +61,7 @@ struct Direction }; static_assert(array_size(groups) == (size_t)Group_::COUNT); - static constexpr inline member_tuple groups_for_draw[] = { + static constexpr member_tuple groups_for_draw[] = { { "wall"_s, &Direction::wall, Group_::wall }, { "side"_s, &Direction::side, Group_::side }, { "top"_s, &Direction::top, Group_::top }, |