From 0db8c75a1c1650fdad9abd4bf81db96366274f1d Mon Sep 17 00:00:00 2001 From: Marisa the Magician Date: Tue, 7 Jun 2022 20:53:59 +0200 Subject: [PATCH] Fix missing CHANF_OVERLAP flag. --- language.version | 4 ++-- zscript/items/swwm_basehealth.zsc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/language.version b/language.version index 328b249c0..7e11848b7 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r102 \cu(Tue 7 Jun 19:30:57 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r102 \cu(2022-06-07 19:30:57)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r103 \cu(Tue 7 Jun 20:53:59 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r103 \cu(2022-06-07 20:53:59)\c-"; diff --git a/zscript/items/swwm_basehealth.zsc b/zscript/items/swwm_basehealth.zsc index 70dbd9128..4a4d943ab 100644 --- a/zscript/items/swwm_basehealth.zsc +++ b/zscript/items/swwm_basehealth.zsc @@ -72,7 +72,7 @@ Class SWWMHealth : Inventory abstract if ( Owner.Health >= GetDefaultByType(giveme).MaxAmount ) return false; // healing items won't get auto-used on pickup if their healing could "be wasted", unless they're powerup health (e.g. Refresher) if ( pickup && !bBIGPOWERUP && (Owner.Health+GetDefaultByType(giveme).Amount > GetDefaultByType(giveme).MaxAmount) ) return false; - if ( pickup && ((Owner.player == players[consoleplayer]) || bBigPowerup) ) Owner.A_StartSound(UseSound,CHAN_ITEMEXTRA); + if ( pickup && ((Owner.player == players[consoleplayer]) || bBigPowerup) ) Owner.A_StartSound(UseSound,CHAN_ITEMEXTRA,CHANF_OVERLAP); SWWMHandler.HealthFlash(Owner.PlayerNumber()); Owner.GiveInventory(giveme,GetDefaultByType(giveme).Amount); SWWMScoreObj.Spawn(GetDefaultByType(giveme).Amount,Owner.Vec3Offset(FRandom[ScoreBits](-8,8),FRandom[ScoreBits](-8,8),FRandom[ScoreBits](-8,8)+Owner.Height/2),ST_Health);