OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Fix height transfers being unconditionally treated as underwater.

Browse source
This commit is contained in:
Mari the Deer 2020-11-20 22:14:37 +01:00
commit 8f8ec3b344
2 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
zscript/swwm_player.zsc
View file

@ -401,7 +401,7 @@ Class Demolitionist : PlayerPawn
Sector headregion = null;
if ( CurSector.moreflags&Sector.SECMF_UNDERWATER ) // check underwater sector
headregion = CurSector;
else if ( CurSector.heightsec ) // check height transfer
else if ( CurSector.heightsec && (Cursector.heightsec.moreflags&Sector.SECMF_UNDERWATER) ) // check height transfer
{
let hsec = CurSector.heightsec;
double fh = hsec.floorplane.ZAtPoint(pos.xy);
@ -423,9 +423,7 @@ Class Demolitionist : PlayerPawn
double ff_top = ff.top.ZAtPoint(pos.xy);
if ( (ff_top <= pos.z) || (ff_bottom > centerpos.z) ) continue;
if ( headpos.z <= ff_top )
{
headregion = ff.model;
}
break;
}
}