summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2024-01-12 01:35:13 +0100
committerStanislaw Halik <sthalik@misaki.pl>2024-01-12 01:35:13 +0100
commita9ffceeffb98f0f5628d3ad347a4e3dbc93b66f3 (patch)
tree9230f569162473b4196e4ef1d848e87c993743e4 /src
parent692edd513bce851a988b0f04209adc480e48fe1f (diff)
a
Diffstat (limited to 'src')
-rw-r--r--src/object-type.hpp3
-rw-r--r--src/scenery.hpp3
2 files changed, 2 insertions, 4 deletions
diff --git a/src/object-type.hpp b/src/object-type.hpp
index 3a6a92e9..8c84c31a 100644
--- a/src/object-type.hpp
+++ b/src/object-type.hpp
@@ -3,8 +3,7 @@
namespace floormat {
enum class object_type : unsigned char {
- none, critter, scenery, light,
+ none, critter, scenery, light, COUNT,
};
-constexpr inline size_t object_type_BITS = 3;
} // namespace floormat
diff --git a/src/scenery.hpp b/src/scenery.hpp
index 05b0683a..bd51db8c 100644
--- a/src/scenery.hpp
+++ b/src/scenery.hpp
@@ -17,11 +17,10 @@ enum class scenery_type : unsigned char {
none, generic,
door, // todo remove it
};
-constexpr inline size_t scenery_type_BITS = 3;
struct scenery_proto : object_proto
{
- scenery_type sc_type : scenery_type_BITS = scenery_type::none;
+ scenery_type sc_type = scenery_type::none;
unsigned char active : 1 = false;
unsigned char closing : 1 = false;
unsigned char interactive : 1 = false;