diff options
Diffstat (limited to 'serialize/world-impl.hpp')
| -rw-r--r-- | serialize/world-impl.hpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/serialize/world-impl.hpp b/serialize/world-impl.hpp index 88844869..b03086da 100644 --- a/serialize/world-impl.hpp +++ b/serialize/world-impl.hpp @@ -46,20 +46,20 @@ template<typename T> constexpr inline T int_max = std::numeric_limits<T>::max(); #define file_magic ".floormat.save" +constexpr inline proto_t proto_version = 14; + constexpr inline size_t atlas_name_max = 128; constexpr inline auto null_atlas = (atlasid)-1LL; constexpr inline size_t character_name_max = 128; constexpr inline size_t string_max = 512; -constexpr inline proto_t proto_version = 13; constexpr inline proto_t min_proto_version = 1; constexpr inline auto chunk_magic = (uint16_t)~0xc0d3; constexpr inline auto scenery_magic = (uint16_t)~0xb00b; using pass_mode_i = std::underlying_type_t<pass_mode>; -constexpr inline pass_mode_i pass_mask = pass_mode_COUNT - 1; -constexpr inline auto pass_bits = std::bit_width(pass_mask); +constexpr inline pass_mode_i pass_mask = (1 << pass_mode_BITS)-1; using entity_type_i = std::underlying_type_t<entity_type>; template<typename T> constexpr inline auto highbit = T(1) << sizeof(T)*8-1; |