diff --git a/source/games/duke/src/actors.cpp b/source/games/duke/src/actors.cpp index cc847aee2..5d52064da 100644 --- a/source/games/duke/src/actors.cpp +++ b/source/games/duke/src/actors.cpp @@ -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)); } diff --git a/source/games/duke/src/actors_d.cpp b/source/games/duke/src/actors_d.cpp index 09684df23..52ee0fe13 100644 --- a/source/games/duke/src/actors_d.cpp +++ b/source/games/duke/src/actors_d.cpp @@ -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; diff --git a/source/games/duke/src/actors_r.cpp b/source/games/duke/src/actors_r.cpp index d89ffedb0..61192575c 100644 --- a/source/games/duke/src/actors_r.cpp +++ b/source/games/duke/src/actors_r.cpp @@ -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; diff --git a/source/games/duke/src/types.h b/source/games/duke/src/types.h index 1f08f7497..b27948ebc 100644 --- a/source/games/duke/src/types.h +++ b/source/games/duke/src/types.h @@ -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;