From cc3b4366fcb9e5481381b5e8c05fd9fc8b7d03ad Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Wed, 28 Apr 2021 09:14:53 +0200 Subject: [PATCH] Fix possible null dereference in heart. --- language.version | 4 ++-- zscript/compat/swwm_compat.zsc | 2 +- zscript/swwm_gesture_fx.zsc | 6 +++++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/language.version b/language.version index c6ed36753..6612e92cb 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r455 \cu(Mon 26 Apr 21:01:29 CEST 2021)\c-"; -SWWM_SHORTVER="\cw0.9.11b-pre r455 \cu(2021-04-26 21:01:29)\c-"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r456 \cu(Wed 28 Apr 09:14:53 CEST 2021)\c-"; +SWWM_SHORTVER="\cw0.9.11b-pre r456 \cu(2021-04-28 09:14:53)\c-"; diff --git a/zscript/compat/swwm_compat.zsc b/zscript/compat/swwm_compat.zsc index e50b5a1aa..0b438d251 100644 --- a/zscript/compat/swwm_compat.zsc +++ b/zscript/compat/swwm_compat.zsc @@ -120,7 +120,7 @@ Class SWWMLevelCompatibility : LevelPostProcessor level.nextsecretmap = level.nextmap; // so the handler can detect this level.nextmap = "E5M1"; break; - // Micro Slaughter Community Project MAP13 (beta) / MAP14 (rc1) + // Micro Slaughter Community Project MAP13 (beta) / MAP14 (v1) case 'E45AA3BE411845AA0DEE7CA5DAAB65FE': case 'CDF12AAE960E6BD11D98E1F0A1782B7B': // reduce OBSCENELY EXCESSIVE number of cell packs in voodoo doll conveyors (400), which will cause immense lag when replaced with mod ammo diff --git a/zscript/swwm_gesture_fx.zsc b/zscript/swwm_gesture_fx.zsc index 4441ca624..3b4965209 100644 --- a/zscript/swwm_gesture_fx.zsc +++ b/zscript/swwm_gesture_fx.zsc @@ -242,7 +242,11 @@ Class LoveHeart : Actor else if ( min(ceilingz,pos.z+height) > cl ) LinePart = 2; else LinePart = 1; } - else LinePart = 1; // always middle + else + { + LinePart = 1; // always middle + LineSide = 0; + } if ( Blocking3DFloor ) { for ( int i=0; i