zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-03-13 20:42:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Mitchell Richters 2023-10-02 20:40:34 +11:00
parent 10ede7ce16
commit 0c8539b0dd
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2265,11 +2265,13 @@ void handle_se05(DDukeActor* actor)
int j;
double x;
int p = findplayer(actor, &x);
const auto p = getPlayer(findplayer(actor, &x));
const auto pact = p->GetActor();
if (x < 512)
{
auto ang = actor->spr.Angles.Yaw;
actor->spr.Angles.Yaw = (actor->spr.pos.XY() - getPlayer(p)->GetActor()->spr.pos.XY()).Angle();
actor->spr.Angles.Yaw = (actor->spr.pos.XY() - pact->spr.pos.XY()).Angle();
shoot(actor, isRR()? RedneckFirelaserClass : DukeFirelaserClass);
actor->spr.Angles.Yaw = ang;
}
@ -2284,7 +2286,7 @@ void handle_se05(DDukeActor* actor)
auto NewOwner = LocateTheLocator(actor->temp_data[4], nullptr);
if (NewOwner == nullptr) break;
double dist = (getPlayer(p)->GetActor()->spr.pos.XY() - NewOwner->spr.pos.XY()).LengthSquared();
double dist = (pact->spr.pos.XY() - NewOwner->spr.pos.XY()).LengthSquared();
if (maxdist > dist)
{
@ -2323,8 +2325,7 @@ void handle_se05(DDukeActor* actor)
}
else
{
actor->temp_angle +=
deltaangle(actor->temp_angle + DAngle90, (getPlayer(p)->GetActor()->spr.pos.XY() - actor->spr.pos.XY()).Angle()) * 0.25;
actor->temp_angle += deltaangle(actor->temp_angle + DAngle90, (pact->spr.pos.XY() - actor->spr.pos.XY()).Angle()) * 0.25;
sc->ceilingshade = 0;
}
j = fi.ifhitbyweapon(actor);