OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Fix collectibles playing "fail use" sound.

Browse source
This commit is contained in:
Mari the Deer 2022-08-06 15:35:02 +02:00
commit 9cd39a74f5
5 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
zscript/handler/swwm_handler_process.zsc
View file

@ -442,6 +442,7 @@ extend Class SWWMHandler
if ( (i is 'SWWMWeapon') && (players[e.Args[0]].PendingWeapon==Weapon(i).SisterWeapon) )
t.result = true;
}
else if ( (i is 'Key') || (i is 'SWWMCollectible') ) t.result = true;
else t.result = rslt;
t.used = item;
t.usedup = (!i||(i.Amount<=0));

2
zscript/kbase/swwm_kbase_priv.zsc
View file

@ -194,7 +194,7 @@ extend Class DemolitionistMenu
MenuSound(snd);
}
}
else if ( (hnd.checklist[j].used is 'SWWMCollectible') || (hnd.checklist[j].used is 'SWWMKey') )
else if ( (hnd.checklist[j].used is 'SWWMCollectible') || (hnd.checklist[j].used is 'Key') )
MenuSound("demolitionist/handsup");
else
{

1
zscript/kbase/swwm_kbasetab_inventory.zsc
View file

@ -538,6 +538,7 @@ Class DemolitionistMenuInvItem : DemolitionistMenuListItem
let t = new("MenuTransaction");
t.uid = master.GenTUID();
t.type = MenuTransaction.TT_ITEMUSE;
t.used = inv.GetClass();
t.result = false;
// don't check weapons, keys or collectibles, always assume check succeeded
if ( (inv is 'Weapon') || (inv is 'Key') || (inv is 'SWWMCollectible') ) t.result = true;

2
zscript/swwm_player.zsc
View file

@ -3061,7 +3061,7 @@ Class Demolitionist : PlayerPawn
{
if ( player == players[consoleplayer] )
{
if ( !(item is 'Weapon') )
if ( !(item is 'Weapon') && !(item is 'SWWMCollectible') )
A_StartSound("menu/noinvuse",CHAN_ITEMEXTRA);
if ( item is 'PuzzleItem' )
SWWMHandler.AddOneliner("puzzfail",2,20);