fix non-sweep traces, refactor some bsp, fix sprite crash in view2d

1 files changed, 18 insertions, 0 deletions

diff --git a/src/game/world/bsp.h b/src/game/world/bsp.h
index fa06696..ac72e14 100644
--- a/src/game/world/bsp.h
+++ b/src/game/world/bsp.h
@@ -25,6 +25,23 @@ enum BspSide_t {
   BSP_SIDE_SPAN = 8,
 };
 
+enum HitMask_t {
+  HM_NONE   = 0,
+  HM_WORLD  = 1 << 1,
+  HM_PROP   = 1 << 2,
+  HM_ENTITY = 1 << 3,
+  HM_PLAYER = 1 << 4,
+  HM_ANY    = 0xffffffff
+};
+
+enum HitGroup_t {
+  HG_NONE     = 0,
+  HG_MOVEMENT = HM_WORLD | HM_PROP,
+  HG_BULLET   = HM_WORLD | HM_PROP | HM_ENTITY,
+  HG_SOLID    = HM_WORLD | HM_PROP | HM_ENTITY,
+  HG_ANY      = 0xffffffff
+};
+
 struct BSP_FACE {
   I32 propid;
   I32 id;
@@ -32,6 +49,7 @@ struct BSP_FACE {
   LIST<VERTEX3D> render_verts{};
   VEC3 mins;
   VEC3 maxs;
+  U32 hitmask;
 };
 
 struct BSP_NODE {