From 5755d4515599b934274dc28d9d4896bf7fe6f95b Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Tue, 30 May 2023 23:36:42 +0200
Subject: serialize/save: simplify up some bit shifting

---
 serialize/world-reader.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'serialize/world-reader.cpp')

diff --git a/serialize/world-reader.cpp b/serialize/world-reader.cpp
index eadda90a..170f9c97 100644
--- a/serialize/world-reader.cpp
+++ b/serialize/world-reader.cpp
@@ -239,9 +239,8 @@ void reader_state::read_chunks(reader_t& s)
         for (auto i = 0uz; i < entity_count; i++)
         {
             object_id _id; _id << s;
-            const auto oid = _id & (1ULL << 60)-1;
+            const auto oid = _id & lowbits<60, object_id>;
             fm_soft_assert(oid != 0);
-            static_assert(entity_type_BITS == 3);
             const auto type = entity_type(_id >> 61);
             const auto local = local_coords{s.read<uint8_t>()};
 
-- 
cgit v1.2.3