finish wall collisions (clipvelocity), some utils

1 files changed, 6 insertions, 1 deletions

diff --git a/src/game/world/trace.cpp b/src/game/world/trace.cpp
index c8ad3be..43f5f68 100644
--- a/src/game/world/trace.cpp
+++ b/src/game/world/trace.cpp
@@ -152,7 +152,10 @@ U8 bsp_trace( BSP_TRACE* trace, BSP* bsp, VEC3 start, VEC3 end ) {
   trace->in_start = start;
   trace->in_end = end;
 
-  return bsp_trace( trace, bsp );
+  U8 ret = bsp_trace( trace, bsp );
+  if( !ret )
+    trace->point = trace->in_end;
+  return ret;
 }
 
 U8 bsp_trace( BSP_TRACE* trace, BSP* bsp ) {
@@ -378,6 +381,8 @@ U8 bsp_trace( BSP_TRACE* trace, BSP* bsp, AABB hull ) {
   VEC3 end = trace->in_end;
 
   U8 ret = bsp_trace_sweep_aabb( trace, bsp, hull, start, end, bsp->root );
+  if( !ret )
+    trace->point = trace->in_end;
   return ret;
 }