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

- Duke: Remove player_struct::backupxy() in lieu of actor variant.

Browse source
This commit is contained in:
Mitchell Richters 2022-11-21 13:14:14 +11:00 committed by Christoph Oelckers
parent 6eeedbd38a
commit a8c923f05c
4 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2052,7 +2052,7 @@ void handle_se14(DDukeActor* actor, bool checkstat, int RPG, int JIBS6)
if (numplayers > 1)
{
ps[p].backupxy();
ps[p].GetActor()->backupvec2();
}
if (psp->spr.extra <= 0)
{
@ -2094,7 +2094,7 @@ void handle_se14(DDukeActor* actor, bool checkstat, int RPG, int JIBS6)
if ((k == nullptr && ud.clipping == 0) || (k == actor->sector() && ps[p].cursector != actor->sector()))
{
ps[p].posXY() = actor->spr.pos.XY();
ps[p].backupxy();
ps[p].GetActor()->backupvec2();
ps[p].setCursector(actor->sector());
SetActor(ps[p].GetActor(), actor->spr.pos);
@ -2213,7 +2213,7 @@ void handle_se30(DDukeActor *actor, int JIBS6)
if (numplayers > 1)
{
ps[p].backupxy();
ps[p].GetActor()->backupvec2();
}
ps[p].bobpos += vect;
@ -2253,7 +2253,7 @@ void handle_se30(DDukeActor *actor, int JIBS6)
if ((k == nullptr && ud.clipping == 0) || (k == actor->sector() && ps[p].cursector != actor->sector()))
{
ps[p].posXY() = actor->spr.pos.XY();
ps[p].backupxy();
ps[p].GetActor()->backupvec2();
ps[p].setCursector(actor->sector());
@ -3347,7 +3347,7 @@ void handle_se20(DDukeActor* actor)
if (ps[p].cursector == actor->sector() && ps[p].on_ground)
{
ps[p].posAdd(vec);
ps[p].backupxy();
ps[p].GetActor()->backupvec2();
SetActor(ps[p].GetActor(), ps[p].posGet().plusZ(gs.playerheight));
}

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

@ -1369,7 +1369,7 @@ void movetransports_d(void)
{
ps[p].posX() += Owner->spr.pos.X - act->spr.pos.X;
ps[p].posY() += Owner->spr.pos.Y - act->spr.pos.Y;
ps[p].backupxy();
ps[p].GetActor()->backupvec2();
if (ps[p].jetpack_on && (PlayerInput(p, SB_JUMP) || ps[p].jetpack_on < 11))
ps[p].posZset(Owner->spr.pos.Z - 24);
@ -1427,7 +1427,7 @@ void movetransports_d(void)
{
ps[p].posX() += Owner->spr.pos.X - act->spr.pos.X;
ps[p].posY() += Owner->spr.pos.Y - act->spr.pos.Y;
ps[p].backupxy();
ps[p].GetActor()->backupvec2();
if (!Owner || Owner->GetOwner() != Owner)
ps[p].transporter_hold = -2;

6
source/games/duke/src/actors_r.cpp
View file

@ -1254,7 +1254,7 @@ void movetransports_r(void)
{
ps[p].posX() += Owner->spr.pos.X - act->spr.pos.X;
ps[p].posY() += Owner->spr.pos.Y - act->spr.pos.Y;
ps[p].backupxy();
ps[p].GetActor()->backupvec2();
if (ps[p].jetpack_on && (PlayerInput(p, SB_JUMP) || ps[p].jetpack_on < 11))
ps[p].posZset(Owner->spr.pos.Z - 24);
@ -1321,7 +1321,7 @@ void movetransports_r(void)
{
ps[p].posX() += Owner->spr.pos.X - act->spr.pos.X;
ps[p].posY() += Owner->spr.pos.Y - act->spr.pos.Y;
ps[p].backupxy();
ps[p].GetActor()->backupvec2();
if (Owner->GetOwner() != Owner)
ps[p].transporter_hold = -2;
@ -1336,7 +1336,7 @@ void movetransports_r(void)
{
ps[p].posoldX() = ps[p].posX() += Owner->spr.pos.X - act->spr.pos.X;
ps[p].posoldY() = ps[p].posY() += Owner->spr.pos.Y - act->spr.pos.Y;
ps[p].backupxy();
ps[p].GetActor()->backupvec2();
if (Owner->GetOwner() != Owner)
ps[p].transporter_hold = -2;

6
source/games/duke/src/types.h
View file

@ -330,12 +330,6 @@ struct player_struct
return cursector != nullptr;
}
void backupxy()
{
GetActor()->opos.X = GetActor()->spr.pos.X;
GetActor()->opos.Y = GetActor()->spr.pos.Y;
}
void backupz()
{
GetActor()->opos.Z = GetActor()->spr.pos.Z;