Fixed: Minor issues with tracking players entering/leaving the void.

skyjake · Aug 31, 2009 · 6262628 · 6262628
1 parent 956639f
commit 6262628
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/doomsday/engine/portable/src/p_maputil.c b/doomsday/engine/portable/src/p_maputil.c
@@ -749,7 +749,9 @@ void P_MobjLink(mobj_t* mo, byte flags)
         player->inVoid = true;
         if(R_IsPointInSector2(player->mo->pos[VX],
                               player->mo->pos[VY],
-                              player->mo->subsector->sector))
+                              player->mo->subsector->sector) &&
+           (player->mo->pos[VZ] < player->mo->subsector->sector->SP_ceilvisheight + 4 &&
+            player->mo->pos[VZ] > player->mo->subsector->sector->SP_floorvisheight + 4))
             player->inVoid = false;
     }
 }

diff --git a/doomsday/engine/portable/src/r_world.c b/doomsday/engine/portable/src/r_world.c
@@ -1539,8 +1539,8 @@ void R_SetupMap(int mode, int flags)
 
                 //// \fixme $nplanes
                 if(ssec &&
-                   ddpl->mo->pos[VZ] > ssec->sector->SP_floorheight + 4 &&
-                   ddpl->mo->pos[VZ] < ssec->sector->SP_ceilheight - 4)
+                   ddpl->mo->pos[VZ] > ssec->sector->SP_floorvisheight + 4 &&
+                   ddpl->mo->pos[VZ] < ssec->sector->SP_ceilvisheight - 4)
                    ddpl->inVoid = false;
             }
         }