zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-01-31 12:30:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Duke: Clean up player/actor accesses in addweapon_d.cpp.

Browse source
This commit is contained in:
Mitchell Richters 2023-10-02 21:14:55 +11:00
parent 95d5e1f57d
commit fe5581f3cf
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
source/games/duke/src/actors_d.cpp
View file

@ -51,7 +51,7 @@ BEGIN_DUKE_NS
void addweapon_d(DukePlayer *p, int weapon, bool wswitch) void addweapon_d(DukePlayer *p, int weapon, bool wswitch)
{ {
if ( p->gotweapon[weapon] == 0 ) if (p->gotweapon[weapon] == 0 )
{ {
p->gotweapon[weapon] = true; p->gotweapon[weapon] = true;
if (weapon == SHRINKER_WEAPON) if (weapon == SHRINKER_WEAPON)
@ -77,6 +77,7 @@ void addweapon_d(DukePlayer *p, int weapon, bool wswitch)
p->curr_weapon = weapon; p->curr_weapon = weapon;
p->wantweaponfire = -1; p->wantweaponfire = -1;
const auto pact = p->GetActor();
switch (weapon) switch (weapon)
{ {
case KNEE_WEAPON: case KNEE_WEAPON:
@ -85,13 +86,13 @@ void addweapon_d(DukePlayer *p, int weapon, bool wswitch)
case HANDBOMB_WEAPON: case HANDBOMB_WEAPON:
break; break;
case SHOTGUN_WEAPON: case SHOTGUN_WEAPON:
S_PlayActorSound(SHOTGUN_COCK, p->GetActor()); S_PlayActorSound(SHOTGUN_COCK, pact);
break; break;
case PISTOL_WEAPON: case PISTOL_WEAPON:
S_PlayActorSound(INSERT_CLIP, p->GetActor()); S_PlayActorSound(INSERT_CLIP, pact);
break; break;
default: default:
S_PlayActorSound(SELECT_WEAPON, p->GetActor()); S_PlayActorSound(SELECT_WEAPON, pact);
break; break;
} }
} }