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

- Duke: Pass player pointer through to alterang().

Browse source
This commit is contained in:
Mitchell Richters 2023-10-03 19:36:36 +11:00
parent cd755a8336
commit 836ed7d931
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1397,7 +1397,7 @@ void move(DDukeActor* actor, int pnum, double pdist)
dodge(actor); dodge(actor);
if (!actor->isPlayer()) if (!actor->isPlayer())
alterang(a, actor, pnum); alterang(a, actor, p);
if (abs(actor->vel.X) < 6 / 16.) actor->vel.X = 0; if (abs(actor->vel.X) < 6 / 16.) actor->vel.X = 0;
@ -4002,13 +4002,12 @@ int furthestcanseepoint(DDukeActor *actor, DDukeActor* tosee, DVector2& pos)
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void alterang(int ang, DDukeActor* actor, int playernum) void alterang(int ang, DDukeActor* actor, DDukePlayer* const p)
{ {
DAngle goalang, aang, angdif; DAngle goalang, aang, angdif;
int j; int j;
int ticselapsed; int ticselapsed;
const auto p = getPlayer(playernum);
const auto pact = p->GetActor(); const auto pact = p->GetActor();
auto moveptr = &ScriptCode[actor->temp_data[1]]; auto moveptr = &ScriptCode[actor->temp_data[1]];

2
source/games/duke/src/funct.h
View file

@ -87,7 +87,7 @@ void handle_se128(DDukeActor* i);
void handle_se130(DDukeActor* i, int countmax); void handle_se130(DDukeActor* i, int countmax);
int dodge(DDukeActor*); int dodge(DDukeActor*);
void alterang(int ang, DDukeActor* actor, int g_p); void alterang(int ang, DDukeActor* actor, DDukePlayer* const p);
void checkavailweapon(DDukePlayer* p); void checkavailweapon(DDukePlayer* p);
void addammo(int weapon, DDukePlayer* p, int amount); void addammo(int weapon, DDukePlayer* p, int amount);