OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Alert users about invalid render settings.

Browse source 
Fix use to pickup potentially affecting respawnable items.
Small code redistribution.
This commit is contained in:
Mari the Deer 2021-09-27 12:28:09 +02:00
commit cdb2aa773f
7 changed files with 320 additions and 297 deletions
Download patch file Download diff file Expand all files Collapse all files

4
zscript/weapons/swwm_baseweapon.zsc
View file

@ -45,7 +45,7 @@ Class SWWMWeapon : Weapon abstract
{
// cannot pick up swapweapon unless explicitly pressing use
SWWMWeapon sw;
if ( swwm_swapweapons && (sw = HasSwapWeapon(toucher)) )
if ( bSPECIAL && swwm_swapweapons && (sw = HasSwapWeapon(toucher)) )
{
if ( toucher.CheckLocalView() )
{
@ -63,6 +63,8 @@ Class SWWMWeapon : Weapon abstract
// allow pickup by use + swap weapon support
override bool Used( Actor user )
{
// can't pick up
if ( !bSPECIAL ) return false;
// no use through melee
if ( (user.player.ReadyWeapon is 'SWWMWeapon') && SWWMWeapon(user.player.ReadyWeapon).wallponch && !swwm_meleepickup )
return false;