From 351c88fe2afe3451d0a34951b823ca323d69cbb6 Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Thu, 3 Sep 2020 16:20:14 +0200 Subject: [PATCH] Fix dash interruption by gibs/corpses from BD monsters. --- language.version | 2 +- zscript/swwm_player.zsc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/language.version b/language.version index cd706da70..9f896e586 100644 --- a/language.version +++ b/language.version @@ -1,2 +1,2 @@ [default] -SWWM_MODVER="\chSWWM \cwGZ\c- r522 (Thu 3 Sep 16:12:10 CEST 2020)"; +SWWM_MODVER="\chSWWM \cwGZ\c- r523 (Thu 3 Sep 16:20:14 CEST 2020)"; diff --git a/zscript/swwm_player.zsc b/zscript/swwm_player.zsc index 110bc90af..d78757df6 100644 --- a/zscript/swwm_player.zsc +++ b/zscript/swwm_player.zsc @@ -657,7 +657,7 @@ Class Demolitionist : PlayerPawn A_StartSound("demolitionist/bump",CHAN_DAMAGE,CHANF_OVERLAP); a.A_StartSound("demolitionist/bump",CHAN_DAMAGE,CHANF_OVERLAP); bumptic = gametic+int(20+spd/4.); - if ( (diff.z < a.height) && (lastvelz >= -25) && (a.bDONTTHRUST || (a.Mass >= Mass*1.5)) ) + if ( (diff.z < a.height) && (lastvelz >= -25) && (a.bDONTTHRUST || (a.Mass >= Mass*1.5)) && a.bSOLID ) { if ( bumped ) continue; bumped = true;