diff --git a/source/games/duke/src/player_d.cpp b/source/games/duke/src/player_d.cpp index a958aa389..3706dc2f3 100644 --- a/source/games/duke/src/player_d.cpp +++ b/source/games/duke/src/player_d.cpp @@ -641,10 +641,9 @@ static void operateJetpack(DDukePlayer* const p, ESyncBits actions, int psectlot // //--------------------------------------------------------------------------- -static void movement(int snum, ESyncBits actions, sectortype* psect, double floorz, double ceilingz, int shrunk, double truefdist, int psectlotag) +static void movement(DDukePlayer* const p, ESyncBits actions, sectortype* psect, double floorz, double ceilingz, int shrunk, double truefdist, int psectlotag) { int j; - auto p = getPlayer(snum); auto pact = p->GetActor(); if (p->airleft != 15 * 26) @@ -1700,7 +1699,7 @@ void processinput_d(int snum) } else if (psectlotag != ST_2_UNDERWATER) { - movement(snum, actions, psectp, floorz, ceilingz, shrunk, truefdist, psectlotag); + movement(p, actions, psectp, floorz, ceilingz, shrunk, truefdist, psectlotag); } p->psectlotag = psectlotag; diff --git a/source/games/duke/src/player_r.cpp b/source/games/duke/src/player_r.cpp index 02292d28f..9c1c037ac 100644 --- a/source/games/duke/src/player_r.cpp +++ b/source/games/duke/src/player_r.cpp @@ -1112,9 +1112,8 @@ static void onBoat(int snum, ESyncBits &actions) // //--------------------------------------------------------------------------- -static void movement(int snum, ESyncBits actions, sectortype* psect, double floorz, double ceilingz, int shrunk, double truefdist, int psectlotag) +static void movement(DDukePlayer* const p, ESyncBits actions, sectortype* psect, double floorz, double ceilingz, int shrunk, double truefdist, int psectlotag) { - auto p = getPlayer(snum); auto pact = p->GetActor(); if (p->airleft != 15 * 26) @@ -2528,7 +2527,7 @@ void processinput_r(int snum) } else { - movement(snum, actions, psectp, floorz, ceilingz, shrunk, truefdist, psectlotag); + movement(p, actions, psectp, floorz, ceilingz, shrunk, truefdist, psectlotag); } p->psectlotag = psectlotag;