From 634db656e7c7e082b8d71d2699ea7d9db4fabd5f Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Tue, 30 Aug 2022 21:32:49 +0200
Subject: [PATCH] - SW: floatified PLAYER::si

---
 source/games/sw/src/draw.cpp | 21 ++++++++++-----------
 source/games/sw/src/game.h   |  2 +-
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/source/games/sw/src/draw.cpp b/source/games/sw/src/draw.cpp
index a3631958e..17a95756c 100644
--- a/source/games/sw/src/draw.cpp
+++ b/source/games/sw/src/draw.cpp
@@ -338,9 +338,8 @@ void DoShadows(tspriteArray& tsprites, tspritetype* tsp, int viewz, int camang)
     else
     {
         // Alter the shadow's position so that it appears behind the sprite itself.
-        int look = getangle(tSpr->int_pos().X - Player[screenpeek].si.X, tSpr->int_pos().Y - Player[screenpeek].si.Y);
-        tSpr->add_int_x(bcos(look, -9));
-        tSpr->add_int_y(bsin(look, -9));
+        auto look = VecToAngle(tSpr->pos.XY() - Player[screenpeek].si.XY());
+		tSpr->pos.XY() += look.ToVector() * 2;
     }
 
     // Check for voxel items and use a round generic pic if so
@@ -752,13 +751,13 @@ void analyzesprites(tspriteArray& tsprites, int viewx, int viewy, int viewz, int
                     if (pp->Flags & (PF_VIEW_FROM_OUTSIDE))
                         tsp->cstat |= (CSTAT_SPRITE_TRANSLUCENT);
 
-                    vec3_t pos;
+                    DVector3 pos;
                     if (pp->Flags & (PF_CLIMBING))
                     {
                         // move sprite forward some so he looks like he's
                         // climbing
-                        pos.X = pp->si.X + MOVEx(128 + 80, tsp->int_ang());
-                        pos.Y = pp->si.Y + MOVEy(128 + 80, tsp->int_ang());
+                        pos.X = pp->si.X + MOVEx(128 + 80, tsp->angle);
+                        pos.Y = pp->si.Y + MOVEy(128 + 80, tsp->angle);
                     }
                     else
                     {
@@ -766,8 +765,8 @@ void analyzesprites(tspriteArray& tsprites, int viewx, int viewy, int viewz, int
                         pos.Y = pp->si.Y;
                     }
 
-                    pos.Z = tsp->int_pos().Z + pp->si.Z;
-                    tsp->set_int_pos(pos);
+                    pos.Z = tsp->pos.Z + pp->si.Z;
+					tsp->pos = pos;
                     tsp->set_int_ang(pp->siang);
                     //continue;
                 }
@@ -1412,9 +1411,9 @@ void drawscreen(PLAYER* pp, double smoothratio, bool sceneonly)
         updatesectorz(tx, ty, tz, &tsect);
     }
 
-    pp->si.X = tx;
-    pp->si.Y = ty;
-    pp->si.Z = tz - pp->int_ppos().Z;
+    pp->si.X = tx * inttoworld;
+    pp->si.Y = ty * inttoworld;
+    pp->si.Z = tz * zinttoworld - pp->pos.Z;
     pp->siang = tang.Buildang();
 
     QuakeViewChange(camerapp, &quake_z, &quake_x, &quake_y, &quake_ang);
diff --git a/source/games/sw/src/game.h b/source/games/sw/src/game.h
index e1ca3787a..c04ec59d3 100644
--- a/source/games/sw/src/game.h
+++ b/source/games/sw/src/game.h
@@ -654,7 +654,7 @@ struct PLAYER
     sectortype* hi_sectp, *lo_sectp;
 
     int circle_camera_dist;
-    vec3_t si; // save player interp position for PlayerSprite
+    DVector3 si; // save player interp position for PlayerSprite
     int16_t siang;
 
     vec2_t vect, ovect, slide_vect;