- SW: Remove PLAYER::posGet().

ZDoom · Nov 26, 2022 · 5372dac · 5372dac
1 parent fe2b44e
commit 5372dac
Show file tree

Hide file tree

Showing 20 changed files with 89 additions and 104 deletions.
diff --git a/source/games/sw/src/ai.cpp b/source/games/sw/src/ai.cpp
@@ -316,7 +316,7 @@ int DoActorPickClosePlayer(DSWActor* actor)
             //    continue;
         }
 
-        dist = (actor->spr.pos - pp->posGet()).Length();
+        dist = (actor->spr.pos - pp->actor->getPosWithOffsetZ()).Length();
 
         if (dist < near_dist)
         {
@@ -342,7 +342,7 @@ int DoActorPickClosePlayer(DSWActor* actor)
                 continue;
         }
 
-        dist = (actor->spr.pos - pp->posGet()).Length();
+        dist = (actor->spr.pos - pp->actor->getPosWithOffsetZ()).Length();
 
         DSWActor* plActor = pp->actor;
 

diff --git a/source/games/sw/src/bunny.cpp b/source/games/sw/src/bunny.cpp
@@ -1022,7 +1022,7 @@ int DoBunnyQuickJump(DSWActor* actor)
                         if (pp == Player+myconnectindex)
                         {
                             choose_snd = StdRandomRange(2<<8)>>8;
-                            if (FAFcansee(ActorVectOfTop(actor),actor->sector(),pp->posGet(), pp->cursector) && Facing(actor, actor->user.targetActor))
+                            if (FAFcansee(ActorVectOfTop(actor),actor->sector(),pp->actor->getPosWithOffsetZ(), pp->cursector) && Facing(actor, actor->user.targetActor))
                                 PlayerSound(fagsnds[choose_snd], v3df_doppler|v3df_follow|v3df_dontpan,pp);
                         }
                     }
@@ -1037,7 +1037,7 @@ int DoBunnyQuickJump(DSWActor* actor)
                         if (pp == Player+myconnectindex)
                         {
                             choose_snd = StdRandomRange(3<<8)>>8;
-                            if (FAFcansee(ActorVectOfTop(actor), actor->sector(), pp->posGet(), pp->cursector) && Facing(actor, actor->user.targetActor))
+                            if (FAFcansee(ActorVectOfTop(actor), actor->sector(), pp->actor->getPosWithOffsetZ(), pp->cursector) && Facing(actor, actor->user.targetActor))
                                 PlayerSound(straightsnds[choose_snd], v3df_doppler | v3df_follow | v3df_dontpan, pp);
                         }
                     }

diff --git a/source/games/sw/src/draw.cpp b/source/games/sw/src/draw.cpp
@@ -811,7 +811,7 @@ static void analyzesprites(tspriteArray& tsprites, const DVector3& viewpos, doub
             else // Otherwise just interpolate the player sprite
             {
                 pp = tActor->user.PlayerP;
-                tsp->pos = interpolatedvalue(pp->posprevGet(), pp->posGet(), interpfrac);
+                tsp->pos = pp->actor->getRenderPos(interpfrac);
                 tsp->angle = pp->angle.interpolatedang(interpfrac);
             }
         }
@@ -1262,7 +1262,7 @@ void drawscreen(PLAYER* pp, double interpfrac, bool sceneonly)
     {
         if (pp->sop_control && (!cl_sointerpolation || (CommEnabled && !pp->sop_remote)))
         {
-            tpos = pp->posGet();
+            tpos = pp->actor->getPosWithOffsetZ();
             tang = pp->angle.ang;
         }
         tsect = pp->cursector;

diff --git a/source/games/sw/src/game.h b/source/games/sw/src/game.h
@@ -1891,20 +1891,6 @@ struct PLAYER
     }
 
 
-    DVector3 posGet()
-    {
-        return actor->spr.pos.plusZ(actor->viewzoffset);
-    }
-
-    void posprevSet(const DVector3& val)
-    {
-        actor->opos = val.plusZ(-actor->viewzoffset);
-    }
-    DVector3 posprevGet()
-    {
-        return actor->opos.plusZ(actor->viewzoffset);
-    }
-
     DVector2& posoldXY()
     {
         return PlayerOldPosition.XY();
@@ -1986,7 +1972,7 @@ inline bool SectorIsUnderwaterArea(sectortype* sect)
 
 inline bool PlayerFacingRange(PLAYER* pp, DSWActor* a, DAngle range)
 {
-    return absangle((a->spr.pos - pp->posGet()).Angle(), pp->angle.ang) < range;
+    return absangle((a->spr.pos.XY() - pp->actor->spr.pos.XY()).Angle(), pp->angle.ang) < range;
 }
 
 inline bool FacingRange(DSWActor* a1, DSWActor* a2, DAngle range)

diff --git a/source/games/sw/src/jsector.cpp b/source/games/sw/src/jsector.cpp
@@ -598,7 +598,7 @@ void JS_DrawCameras(PLAYER* pp, const DVector3& campos, double smoothratio)
 
                     // If player is dead still then update at MoveSkip4
                     // rate.
-                    if (pp->posGet() == pp->posprevGet())
+                    if (pp->actor->spr.pos == pp->actor->opos)
                         DoCam = true;
 
 
@@ -612,7 +612,7 @@ void JS_DrawCameras(PLAYER* pp, const DVector3& campos, double smoothratio)
 
                             if (TEST_BOOL11(camactor) && numplayers > 1)
                             {
-                                drawroomstotile(cp->posGet(), cp->angle.ang, cp->horizon.horiz, cp->cursector, mirror[cnt].campic, smoothratio);
+                                drawroomstotile(cp->actor->getPosWithOffsetZ(), cp->angle.ang, cp->horizon.horiz, cp->cursector, mirror[cnt].campic, smoothratio);
                             }
                             else
                             {

diff --git a/source/games/sw/src/jweapon.cpp b/source/games/sw/src/jweapon.cpp
@@ -1256,7 +1256,7 @@ int PlayerInitChemBomb(PLAYER* pp)
     if (!pp->insector())
         return 0;
 
-    auto pos = pp->posGet().plusZ(pp->bob_z + 8);
+    auto pos = pp->actor->getPosWithOffsetZ().plusZ(pp->bob_z + 8);
 
     // Spawn a shot
     // Inserting and setting up variables
@@ -1630,7 +1630,7 @@ int PlayerInitCaltrops(PLAYER* pp)
     if (!pp->insector())
         return 0;
 
-    auto pos = pp->posGet().plusZ(pp->bob_z + 8);
+    auto pos = pp->actor->getPosWithOffsetZ().plusZ(pp->bob_z + 8);
 
     auto actorNew = SpawnActor(STAT_DEAD_ACTOR, CALTROPS, s_Caltrops, pp->cursector, pos, pp->angle.ang, (CHEMBOMB_VELOCITY + RandomRangeF(CHEMBOMB_VELOCITY)) / 2);
 

diff --git a/source/games/sw/src/mclip.cpp b/source/games/sw/src/mclip.cpp
@@ -60,7 +60,7 @@ Collision MultiClipMove(PLAYER* pp, double zz, double floordist)
         // move the box to position instead of using offset- this prevents small rounding errors
         // allowing you to move through wall
         DAngle ang = (pp->angle.ang + sop->clipbox_ang[i]);
-        DVector3 spos(pp->posGet(), zz);
+        DVector3 spos(pp->actor->getPosWithOffsetZ(), zz);
 
         DVector2 vect = ang.ToVector() * sop->clipbox_vdist[i];
         Collision coll;
@@ -73,7 +73,7 @@ Collision MultiClipMove(PLAYER* pp, double zz, double floordist)
             min_dist = 0;
             min_ndx = i;
             // ox is where it should be
-            opos[i].XY() = pp->posGet() + ang.ToVector() * sop->clipbox_vdist[i];
+            opos[i].XY() = pp->actor->getPosWithOffsetZ() + ang.ToVector() * sop->clipbox_vdist[i];
 
             // spos.x is where it hit
             pos[i].XY() = spos.XY();
@@ -133,7 +133,7 @@ int MultiClipTurn(PLAYER* pp, DAngle new_ang, double zz, double floordist)
     {
         DAngle ang = new_ang + sop->clipbox_ang[i];
 
-        DVector3 spos(pp->posGet(), zz);
+        DVector3 spos(pp->actor->getPosWithOffsetZ(), zz);
 
         DVector2 vect = ang.ToVector() * sop->clipbox_vdist[i];
         Collision coll;

diff --git a/source/games/sw/src/ninja.cpp b/source/games/sw/src/ninja.cpp
@@ -2475,7 +2475,7 @@ void SpawnPlayerUnderSprite(PLAYER* pp)
     int pnum = int(pp - Player);
 
     pp->PlayerUnderActor = SpawnActor(STAT_PLAYER_UNDER0 + pnum,
-                                                 NINJA_RUN_R0, nullptr, pp->cursector, pp->posGet(), pp->angle.ang);
+                                                 NINJA_RUN_R0, nullptr, pp->cursector, pp->actor->getPosWithOffsetZ(), pp->angle.ang);
 
     DSWActor* actor = pp->PlayerUnderActor;