zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-23 04:22:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Mitchell Richters 2023-10-04 10:25:46 +11:00
parent e025e0d2a1
commit f14d7f3612
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
source/games/duke/src/player_d.cpp
View file

@ -877,9 +877,8 @@ int operateTripbomb(DDukePlayer* const p)
//
//---------------------------------------------------------------------------
static void fireweapon(int snum)
static void fireweapon(DDukePlayer* const p)
{
auto p = getPlayer(snum);
auto pact = p->GetActor();
p->crack_time = CRACK_TIME;
@ -1511,7 +1510,7 @@ static void processweapon(int snum, ESyncBits actions)
else if (shrunk == 0 && (actions & SB_FIRE) && p->kickback_pic == 0 && p->fist_incs == 0 &&
p->last_weapon == -1 && (p->weapon_pos == 0 || p->holster_weapon == 1))
{
if (!isWW2GI()) fireweapon(snum);
if (!isWW2GI()) fireweapon(p);
else fireweapon_ww(snum);
}
else if (p->kickback_pic)

11
source/games/duke/src/player_r.cpp
View file

@ -1499,10 +1499,9 @@ void onBoatHit(int snum, DDukeActor* victim)
//
//---------------------------------------------------------------------------
static void fireweapon(int snum)
static void fireweapon(DDukePlayer* const p)
{
auto p = getPlayer(snum);
const auto pact = p->GetActor();
p->crack_time = CRACK_TIME;
if (p->holster_weapon == 1)
@ -1563,13 +1562,13 @@ static void fireweapon(int snum)
if (p->ammo_amount[BUZZSAW_WEAPON] > 0)
{
p->kickback_pic = 1;
S_PlayActorSound(431, p->GetActor());
S_PlayActorSound(431, pact);
}
}
else if (p->ammo_amount[THROWSAW_WEAPON] > 0)
{
p->kickback_pic = 1;
S_PlayActorSound(SHRINKER_FIRE, p->GetActor());
S_PlayActorSound(SHRINKER_FIRE, pact);
}
break;
@ -2244,7 +2243,7 @@ static void processweapon(int snum, ESyncBits actions, sectortype* psectp)
else if (shrunk == 0 && (actions & SB_FIRE) && p->kickback_pic == 0 && p->fist_incs == 0 &&
p->last_weapon == -1 && (p->weapon_pos == 0 || p->holster_weapon == 1))
{
fireweapon(snum);
fireweapon(p);
}
else if (p->kickback_pic)
{