diff options
Diffstat (limited to 'src/chunk.hpp')
-rw-r--r-- | src/chunk.hpp | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/src/chunk.hpp b/src/chunk.hpp index 6833ab03..75fe4bc7 100644 --- a/src/chunk.hpp +++ b/src/chunk.hpp @@ -5,6 +5,7 @@ #include "src/RTree-fwd.h" #include "global-coords.hpp" #include "wall-defs.hpp" +#include "collision.hpp" #include <type_traits> #include <array> #include <Corrade/Containers/Array.h> @@ -20,22 +21,6 @@ struct object_proto; class tile_iterator; class tile_const_iterator; -enum class collision : unsigned char { - view, shoot, move, -}; - -enum class collision_type : unsigned char { - none, object, scenery, geometry, -}; - -constexpr inline size_t collision_data_BITS = 60; - -struct collision_data final { - uint64_t tag : 2; - uint64_t pass : 2; - uint64_t data : collision_data_BITS; -}; - struct chunk final { friend struct tile_ref; |