3 files changed, 9 insertions, 3 deletions
diff --git a/src/game/world/bsp.cpp b/src/game/world/bsp.cpp
index a95a693..c6c9726 100644
--- a/src/game/world/bsp.cpp
+++ b/src/game/world/bsp.cpp
@@ -736,6 +736,7 @@ BSP* bsp_build_map( WORLD_MAP* m ) {
 
   bsp_build_portals( bsp );
   bsp_build_pvs( bsp );
+  m->bsp = bsp;
   return bsp;
 }
 
diff --git a/src/game/world/map.cpp b/src/game/world/map.cpp
index aba283d..53cfe22 100644
--- a/src/game/world/map.cpp
+++ b/src/game/world/map.cpp
@@ -518,13 +518,13 @@ WORLD_MAP* map_from_file( GAME_DATA* game, const char* path ) {
   CFG_SECTION* skybox = cfg_section( s, "skybox" );
   if( !skybox ) {
     dlog( errstr, path, "skybox" );
-    dlog( "using default skybox" );
+    dlog( "using default skybox\n" );
     m->skybox = map_default_skybox();
   }
   else {
     if( !OK( map_skybox_from_section( skybox, game, m ) ) ) {
       dlog( errstr, path, "skybox" );
-      dlog( "using default skybox" );
+      dlog( "using default skybox\n" );
       m->skybox = map_default_skybox();
     }
   }
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;
 }