OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- added Gez's patch for proper splash checks with 3D-floors.

Browse source 
SVN r3295 (trunk)
This commit is contained in:
Christoph Oelckers 2011-09-21 19:39:12 +00:00
commit a0bb1c2546
5 changed files with 101 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/p_mobj.cpp
View file

@ -4737,7 +4737,16 @@ bool P_HitWater (AActor * thing, sector_t * sec, fixed_t x, fixed_t y, fixed_t z
if (y == FIXED_MIN) y = thing->y;
if (z == FIXED_MIN) z = thing->z;
// don't splash above the object
if (checkabove && z > thing->z + (thing->height >> 1)) return false;
if (checkabove)
{
fixed_t compare_z = thing->z + (thing->height >> 1);
// Missiles are typically small and fast, so they might
// end up submerged by the move that calls P_HitWater.
if (thing->flags & MF_MISSILE)
compare_z -= thing->velz;
if (z > compare_z)
return false;
}
#if 0 // needs some rethinking before activation