zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-21 19:51:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added PostFind<Next/Prev>Weapon functions to PlayerPawns.

Browse source 
- Ensures that pawns have the final say on weapon selection if needed.
This commit is contained in:
Major Cooke 2024-11-10 13:01:31 -06:00
parent 362100fcf0
commit 2eeb489184
1 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
wadsrc/static/zscript/actors/player/player.zs
View file

@ -2347,9 +2347,16 @@ class PlayerPawn : Actor
return pick;
}
virtual Weapon PostFindWeapon(int slot, bool checkammo, Weapon orig, Weapon mod)
{
return mod;
}
Weapon FindWeapon(int slot, bool checkammo)
{
return CallModifyPickWeapon(slot, checkammo, PickWeapon(slot, checkammo));
let orig = PickWeapon(slot, checkammo);
let mod = CallModifyPickWeapon(slot, checkammo, orig);
return PostFindWeapon(slot, checkammo, orig, mod);
}
//===========================================================================
@ -2469,9 +2476,16 @@ class PlayerPawn : Actor
return pick;
}
virtual Weapon PostFindNextWeapon(Weapon orig, Weapon mod)
{
return mod;
}
Weapon FindNextWeapon()
{
return CallModifyPickNextWeapon(PickNextWeapon());
let orig = PickNextWeapon();
let mod = CallModifyPickNextWeapon(orig);
return PostFindNextWeapon(orig, mod);
}
//===========================================================================
@ -2540,9 +2554,16 @@ class PlayerPawn : Actor
return pick;
}
virtual Weapon PostFindPrevWeapon(Weapon orig, Weapon mod)
{
return mod;
}
Weapon FindPrevWeapon()
{
return CallModifyPickPrevWeapon(PickPrevWeapon());
let orig = PickPrevWeapon();
let mod = CallModifyPickPrevWeapon(orig);
return PostFindPrevWeapon(orig, mod);
}
//============================================================================