OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Fix crash when Love Heart somehow can't find the 3D floor that was hit.

Browse source
This commit is contained in:
Mari the Deer 2021-05-26 09:18:26 +02:00
commit 910c38f2b9
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
language.version
View file

@ -1,3 +1,3 @@
[default]
SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r508 \cu(Wed 26 May 09:10:45 CEST 2021)\c-";
SWWM_SHORTVER="\cw0.9.11b-pre r508 \cu(2021-05-26 09:10:45)\c-";
SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r509 \cu(Wed 26 May 09:18:26 CEST 2021)\c-";
SWWM_SHORTVER="\cw0.9.11b-pre r509 \cu(2021-05-26 09:18:26)\c-";

7
zscript/swwm_gesture_fx.zsc
View file

@ -257,8 +257,11 @@ Class LoveHeart : Actor
Hit3DFloor = ff;
break;
}
if ( Hit3DFloor.flags&F3DFloor.FF_UPPERTEXTURE ) HitTexture = HitLine.sidedef[LineSide].GetTexture(0);
else if ( Hit3DFloor.flags&F3DFloor.FF_LOWERTEXTURE ) HitTexture = HitLine.sidedef[LineSide].GetTexture(2);
if ( Hit3DFloor )
{
if ( Hit3DFloor.flags&F3DFloor.FF_UPPERTEXTURE ) HitTexture = HitLine.sidedef[LineSide].GetTexture(0);
else if ( Hit3DFloor.flags&F3DFloor.FF_LOWERTEXTURE ) HitTexture = HitLine.sidedef[LineSide].GetTexture(2);
}
}
else HitTexture = HitLine.sidedef[LineSide].GetTexture(LinePart);
}