zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-01-18 22:51:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Duke: Clean up player/actor accesses in checkavailweapon().

Browse source
This commit is contained in:
Mitchell Richters 2023-10-02 20:36:58 +11:00
parent 3925af453a
commit 892eb16d8b
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
source/games/duke/src/actors.cpp
View file

@ -301,16 +301,18 @@ void checkavailweapon(DukePlayer* player)
player->curr_weapon = weap;
if (isWW2GI())
{
SetGameVarID(g_iWeaponVarID, player->curr_weapon, player->GetActor(), snum); // snum is player index!
const auto pact = player->GetActor();
SetGameVarID(g_iWeaponVarID, player->curr_weapon, pact, snum); // snum is player index!
if (player->curr_weapon >= 0)
{
SetGameVarID(g_iWorksLikeVarID, aplWeaponWorksLike(player->curr_weapon, snum), player->GetActor(), snum);
SetGameVarID(g_iWorksLikeVarID, aplWeaponWorksLike(player->curr_weapon, snum), pact, snum);
}
else
{
SetGameVarID(g_iWorksLikeVarID, -1, player->GetActor(), snum);
SetGameVarID(g_iWorksLikeVarID, -1, pact, snum);
}
OnEvent(EVENT_CHANGEWEAPON, snum, player->GetActor(), -1);
OnEvent(EVENT_CHANGEWEAPON, snum, pact, -1);
}
player->okickback_pic = player->kickback_pic = 0;