From 82d0100dec2e97cd4118534e8716acf1f03f4b08 Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Sat, 20 Mar 2021 13:50:12 +0100 Subject: [PATCH] Fix toe stubbing on small objects on ground. --- language.version | 4 ++-- zscript/swwm_player.zsc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/language.version b/language.version index 4a529b67b..38ba45811 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r380 \cu(Fri 19 Mar 22:17:40 CET 2021)\c-"; -SWWM_SHORTVER="\cw0.9.11b-pre r380 \cu(2021-03-19 22:17:40)\c-"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r381 \cu(Sat 20 Mar 13:50:12 CET 2021)\c-"; +SWWM_SHORTVER="\cw0.9.11b-pre r381 \cu(2021-03-20 13:50:12)\c-"; diff --git a/zscript/swwm_player.zsc b/zscript/swwm_player.zsc index 0dd792736..5f0eb82b1 100644 --- a/zscript/swwm_player.zsc +++ b/zscript/swwm_player.zsc @@ -1036,8 +1036,8 @@ Class Demolitionist : PlayerPawn { a = bi.Thing; if ( !a || (a == self) || (!a.bSOLID && !a.bSHOOTABLE) || a.bTHRUACTORS || a.bCORPSE ) continue; - if ( !SWWMUtility.ExtrudeIntersect(self,a,dir*spd,8,16) ) continue; - if ( !CheckSight(a,SF_IGNOREVISIBILITY|SF_IGNOREWATERBOUNDARY) ) continue; + if ( !SWWMUtility.ExtrudeIntersect(self,a,dir*(spd+radius),8) ) continue; + if ( (a.pos.z <= a.floorz) && (a.height <= MaxStepHeight) ) continue; Vector3 diff = level.Vec3Diff(pos,a.pos); Vector3 dirto = diff.unit(); if ( dir dot dirto < .1 ) continue;