OrdinaryMagician/flak_m
OrdinaryMagician/flak_m
1
Fork 0
Code Activity

Fix multiple return warnings.

Browse source
This commit is contained in:
Marisa the Magician 2023-12-23 20:20:46 +01:00
commit 7c1cf8bacc
3 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
zscript/enforcer.zsc
View file

@ -231,7 +231,11 @@ Class Enforcer : UTWeapon
override int, int, bool, bool GetClipAmount() override int, int, bool, bool GetClipAmount()
{ {
if ( !flak_enforcerreload ) return Super.GetClipAmount(); if ( !flak_enforcerreload )
{
let [foo, bar, baz, qux] = Super.GetClipAmount();
return foo, bar, baz, qux;
}
if ( Amount > 1 ) return ClipOut?-1:ClipCount, SlaveClipOut?-1:SlaveClipCount, (ClipCount<5), (SlaveClipCount<5); if ( Amount > 1 ) return ClipOut?-1:ClipCount, SlaveClipOut?-1:SlaveClipCount, (ClipCount<5), (SlaveClipCount<5);
return ClipOut?-1:ClipCount, -1, (ClipCount<5), false; return ClipOut?-1:ClipCount, -1, (ClipCount<5), false;
} }

6
zscript/pulsegun.zsc
View file

@ -646,7 +646,11 @@ Class PulseGun : UTWeapon
override int, int, bool, bool GetClipAmount() override int, int, bool, bool GetClipAmount()
{ {
if ( !flak_pulsereload ) return Super.GetClipAmount(); if ( !flak_pulsereload )
{
let [foo, bar, baz, qux] = Super.GetClipAmount();
return foo, bar, baz, qux;
}
return ClipOut?-1:ClipCount, -1, (ClipCount<10), false; return ClipOut?-1:ClipCount, -1, (ClipCount<10), false;
} }

6
zscript/translocator.zsc
View file

@ -384,7 +384,11 @@ Class Translocator : UTWeapon
override int, int, bool, bool GetClipAmount() override int, int, bool, bool GetClipAmount()
{ {
if ( !flak_transloc2k4 ) return Super.GetClipAmount(); if ( !flak_transloc2k4 )
{
let [foo, bar, baz, qux] = Super.GetClipAmount();
return foo, bar, baz, qux;
}
return (ammocharge>0)?int(ammocharge*9.9):-1, -1, false, false; return (ammocharge>0)?int(ammocharge*9.9):-1, -1, false, false;
} }