a

3 files changed, 14 insertions, 14 deletions

diff --git a/serialize/world-impl.hpp b/serialize/world-impl.hpp
index 0ec1dee4..d4b2feaa 100644
--- a/serialize/world-impl.hpp
+++ b/serialize/world-impl.hpp
@@ -70,10 +70,10 @@ constexpr inline auto highbits = (T(1) << N)-1 << sizeof(T)*8-N-off;
 template<size_t N, typename T = uint8_t>
 constexpr T lowbits = T((T{1} << N)-T{1});
 
-constexpr inline atlasid meta_short_scenery_bit = highbits<atlasid, 1, 0>;
-constexpr inline atlasid meta_rotation_bits = highbits<atlasid, rotation_BITS, 1>;
-constexpr inline atlasid scenery_id_flag_mask = meta_short_scenery_bit | meta_rotation_bits;
-constexpr inline atlasid scenery_id_max = int_max<atlasid> & ~scenery_id_flag_mask;
+constexpr inline atlasid meta_short_scenery_bit_ = highbits<atlasid, 1, 0>;
+constexpr inline atlasid meta_rotation_bits_ = highbits<atlasid, rotation_BITS, 1>;
+constexpr inline atlasid scenery_id_flag_mask_ = meta_short_scenery_bit_ | meta_rotation_bits_;
+constexpr inline atlasid scenery_id_max_ = int_max<atlasid> & ~scenery_id_flag_mask_;
 
 } // namespace
 
diff --git a/serialize/world-reader.cpp b/serialize/world-reader.cpp
index 71d55cb7..324a0d19 100644
--- a/serialize/world-reader.cpp
+++ b/serialize/world-reader.cpp
@@ -95,7 +95,7 @@ void reader_state::read_sceneries(reader_t& s)
     if (magic != scenery_magic)
         fm_throw("bad scenery magic"_cf);
     atlasid sz; sz << s;
-    fm_soft_assert(sz < scenery_id_max);
+    fm_soft_assert(sz < scenery_id_max_);
     sceneries.resize(sz);
 
     auto i = 0uz;
@@ -297,7 +297,7 @@ void reader_state::read_chunks(reader_t& s)
                 offset_frac[1] << s;
                 if (PROTO < 17) [[unlikely]]
                     offset_frac = {};
-                const bool exact = id & meta_short_scenery_bit;
+                const bool exact = id & meta_short_scenery_bit_;
                 SET_CHUNK_SIZE();
 
                 if (PROTO >= 9) [[likely]]
@@ -330,9 +330,9 @@ void reader_state::read_chunks(reader_t& s)
             }
             case object_type::scenery: {
                 atlasid id; id << s;
-                const bool exact = id & meta_short_scenery_bit;
+                const bool exact = id & meta_short_scenery_bit_;
                 const auto r = rotation(id >> sizeof(id)*8-1-rotation_BITS & rotation_MASK);
-                id &= ~scenery_id_flag_mask;
+                id &= ~scenery_id_flag_mask_;
                 auto sc = lookup_scenery(id);
                 sc.offset = offset;
                 (void)sc.atlas->group(r);
@@ -423,9 +423,9 @@ void reader_state::preload_chunks()
 void reader_state::read_old_scenery(reader_t& s, chunk_coords_ ch, size_t i)
 {
     atlasid id; id << s;
-    const bool exact = id & meta_short_scenery_bit;
+    const bool exact = id & meta_short_scenery_bit_;
     const auto r = rotation(id >> sizeof(id)*8-1-rotation_BITS & rotation_MASK);
-    id &= ~scenery_id_flag_mask;
+    id &= ~scenery_id_flag_mask_;
     auto sc = lookup_scenery(id);
     (void)sc.atlas->group(r);
     sc.r = r;
diff --git a/serialize/world-writer.cpp b/serialize/world-writer.cpp
index 6de452c2..3d16505c 100644
--- a/serialize/world-writer.cpp
+++ b/serialize/world-writer.cpp
@@ -244,7 +244,7 @@ constexpr auto atlasbuf_size1 = sizeof(uint8_t) + atlasbuf_size0*int_max<uint8_t
 
 void writer_state::serialize_scenery_names()
 {
-    fm_assert(scenery_map_size < scenery_id_max);
+    fm_assert(scenery_map_size < scenery_id_max_);
     const size_t sz = scenery_map_size;
     std::vector<interned_scenery> vec; vec.reserve(scenery_map_size);
     for (const auto& x : scenery_map)
@@ -269,7 +269,7 @@ void writer_state::serialize_scenery_names()
     auto s = binary_writer{scenery_buf.begin()};
 
     s << uint16_t{scenery_magic};
-    fm_assert(sz < scenery_id_max);
+    fm_assert(sz < scenery_id_max_);
     s << (atlasid)sz;
 
     StringView last;
@@ -358,7 +358,7 @@ void writer_state::serialize_scenery(const chunk& c, writer_t& s)
             const auto sc_exact =
                 C.bbox_offset.isZero() &&
                 C.bbox_size == def_char_bbox_size;
-            id |= meta_short_scenery_bit * sc_exact;
+            id |= meta_short_scenery_bit_ * sc_exact;
             id |= static_cast<decltype(id)>(C.r) << sizeof(id)*8-1-rotation_BITS;
             s << id;
             write_object_flags(s, C);
@@ -387,7 +387,7 @@ void writer_state::serialize_scenery(const chunk& c, writer_t& s)
             atlasid id = img_s;
             static_assert(rotation_BITS == 3);
             fm_assert(id == (id & lowbits<16-3-1, atlasid>));
-            id |= meta_short_scenery_bit * sc_exact;
+            id |= meta_short_scenery_bit_ * sc_exact;
             id |= static_cast<decltype(id)>(sc.r) << sizeof(id)*8-1-rotation_BITS;
             s << id;
             if (!sc_exact)