zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- fixed PlayerInfo.FindMostRecentWeapon 

returning multiple values from a subfunction is currently not working so this has to add an indirection.
This commit is contained in:
Christoph Oelckers 2018-12-21 10:27:01 +01:00
parent ebaabcfb4f
commit 1deedd5671
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
wadsrc/static/zscript/shared/player.txt
View File

@ -1924,7 +1924,12 @@ class PlayerPawn : Actor native
let ReadyWeapon = player.ReadyWeapon; let ReadyWeapon = player.ReadyWeapon;
if (player.PendingWeapon != WP_NOCHANGE) if (player.PendingWeapon != WP_NOCHANGE)
{ {
return player.weapons.LocateWeapon(player.PendingWeapon.GetClass()); // Workaround for the current inability
bool found;
int slot;
int index;
[found, slot, index] = player.weapons.LocateWeapon(player.PendingWeapon.GetClass());
return found, slot, index;
} }
else if (ReadyWeapon != null) else if (ReadyWeapon != null)
{ {