From ab82bda5958e4c10d3c6b0b8bcc093093e50b1eb Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Fri, 23 Oct 2020 22:26:31 +0200 Subject: [PATCH] Fix blood drops preventing saves --- language.version | 2 +- zscript/swwm_blod.zsc | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/language.version b/language.version index b1d770a4d..b9a5d3386 100644 --- a/language.version +++ b/language.version @@ -1,2 +1,2 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r571 \cu(Fri 23 Oct 21:38:38 CEST 2020)"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r572 \cu(Fri 23 Oct 22:26:31 CEST 2020)"; diff --git a/zscript/swwm_blod.zsc b/zscript/swwm_blod.zsc index 18d0c375e..241fb97f6 100644 --- a/zscript/swwm_blod.zsc +++ b/zscript/swwm_blod.zsc @@ -121,7 +121,7 @@ Class mkBloodDrop : Actor bool dead, onceiling; mkBloodDrop prevblod, nextblod; Sector tracksector; - F3DFloor trackffloor; + Sector trackffloor; // can't use F3DFloor, blocks saving int trackplane; Default @@ -155,8 +155,8 @@ Class mkBloodDrop : Actor double trackz; if ( trackffloor ) { - if ( trackplane ) trackz = trackffloor.bottom.ZAtPoint(pos.xy)-.1; - else trackz = trackffloor.top.ZAtPoint(pos.xy); + if ( trackplane ) trackz = trackffloor.floorplane.ZAtPoint(pos.xy)-.1; + else trackz = trackffloor.ceilingplane.ZAtPoint(pos.xy); } else { @@ -257,7 +257,7 @@ Class mkBloodDrop : Actor ff = FloorSector.Get3DFloor(i); break; } - if ( ff ) trackffloor = ff; + if ( ff ) trackffloor = ff.model; frame = Random[Blood](5,8); return; } @@ -284,7 +284,7 @@ Class mkBloodDrop : Actor ff = CeilingSector.Get3DFloor(i); break; } - if ( ff ) trackffloor = ff; + if ( ff ) trackffloor = ff.model; frame = Random[Blood](5,8); special1 = Random[Blood](15,25); special2 = 0;