From c41af213b4ae1d8abacd127cf50c5595deb79247 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Sat, 10 Sep 2022 22:16:37 +0200
Subject: [PATCH] - another set of simple changes.

---
 source/games/exhumed/src/aistuff.h | 2 +-
 source/games/exhumed/src/gun.cpp   | 2 +-
 source/games/exhumed/src/move.cpp  | 9 ++++-----
 source/games/exhumed/src/snake.cpp | 4 ++--
 source/games/exhumed/src/view.cpp  | 2 +-
 source/games/exhumed/src/wasp.cpp  | 2 +-
 6 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/source/games/exhumed/src/aistuff.h b/source/games/exhumed/src/aistuff.h
index 75386a1c3..02b9c9ebb 100644
--- a/source/games/exhumed/src/aistuff.h
+++ b/source/games/exhumed/src/aistuff.h
@@ -726,7 +726,7 @@ extern FreeListArray<Snake, kMaxSnakes> SnakeList;
 
 void InitSnakes();
 int GrabSnake();
-void BuildSnake(int nPlayer, int zVal);
+void BuildSnake(int nPlayer, double zVal);
 void FuncSnake(int, int, int, int);
 
 // spider
diff --git a/source/games/exhumed/src/gun.cpp b/source/games/exhumed/src/gun.cpp
index 1812da346..6c447522b 100644
--- a/source/games/exhumed/src/gun.cpp
+++ b/source/games/exhumed/src/gun.cpp
@@ -809,7 +809,7 @@ loc_flag:
                 }
                 case kWeaponStaff:
                 {
-                    BuildSnake(nPlayer, nHeight * zworldtoint);
+                    BuildSnake(nPlayer, nHeight);
                     nQuake[nPlayer] = 2.;
 
                     PlayerList[nPlayer].nThrust -= pPlayerActor->spr.angle.ToVector() * 2;
diff --git a/source/games/exhumed/src/move.cpp b/source/games/exhumed/src/move.cpp
index 446e5da25..70bb436d8 100644
--- a/source/games/exhumed/src/move.cpp
+++ b/source/games/exhumed/src/move.cpp
@@ -213,7 +213,7 @@ int BelowNear(DExhumedActor* pActor, double walldist)
     }
 }
 
-Collision movespritez(DExhumedActor* pActor, double z, double height, int clipdist)
+Collision movespritez(DExhumedActor* pActor, double z, double height, double clipdist)
 {
     auto pSector = pActor->sector();
     assert(pSector);
@@ -376,7 +376,7 @@ Collision movespritez(DExhumedActor* pActor, double z, double height, int clipdi
 
     if (pActor->spr.statnum == 100)
     {
-        nRet.exbits |= BelowNear(pActor, clipdist * (inttoworld * 1.5));
+        nRet.exbits |= BelowNear(pActor, clipdist * 1.5);
     }
 
     return nRet;
@@ -401,7 +401,6 @@ Collision movesprite(DExhumedActor* pActor, int dx, int dy, int dz, int ceildist
 
 	auto spos = pActor->spr.pos;
     double nSpriteHeight = GetActorHeight(pActor);
-    int nClipDist = pActor->int_clipdist();
     auto pSector = pActor->sector();
     assert(pSector);
 
@@ -412,7 +411,7 @@ Collision movesprite(DExhumedActor* pActor, int dx, int dy, int dz, int ceildist
         vect *= 0.5;
     }
 
-    Collision nRet = movespritez(pActor, dz * zinttoworld, nSpriteHeight, nClipDist);
+    Collision nRet = movespritez(pActor, dz * zinttoworld, nSpriteHeight, pActor->fClipdist());
 
     pSector = pActor->sector(); // modified in movespritez so re-grab this variable
 
@@ -435,7 +434,7 @@ Collision movesprite(DExhumedActor* pActor, int dx, int dy, int dz, int ceildist
     }
 
     Collision coll;
-    clipmove(pActor->spr.pos, &pSector, FloatToFixed<18>(vect.X), FloatToFixed<18>(vect.Y), nClipDist, int(nSpriteHeight * zworldtoint), flordist, clipmask, coll);
+    clipmove(pActor->spr.pos, &pSector, FloatToFixed<18>(vect.X), FloatToFixed<18>(vect.Y), pActor->int_clipdist(), int(nSpriteHeight * zworldtoint), flordist, clipmask, coll);
     if (coll.type != kHitNone) // originally this or'ed the two values which can create unpredictable bad values in some edge cases.
     {
         coll.exbits = nRet.exbits;
diff --git a/source/games/exhumed/src/snake.cpp b/source/games/exhumed/src/snake.cpp
index ad88d6778..6654f3b14 100644
--- a/source/games/exhumed/src/snake.cpp
+++ b/source/games/exhumed/src/snake.cpp
@@ -124,9 +124,9 @@ void ExplodeSnakeSprite(DExhumedActor* pActor, int nPlayer)
     StopActorSound(pActor);
 }
 
-void BuildSnake(int nPlayer, int zVal_)
+void BuildSnake(int nPlayer, double zVal)
 {
-    double zVal = zVal_ * zinttoworld - 5;
+    zVal -= 5;
 
     auto pPlayerActor = PlayerList[nPlayer].pActor;
     auto pViewSect = PlayerList[nPlayer].pPlayerViewSect;
diff --git a/source/games/exhumed/src/view.cpp b/source/games/exhumed/src/view.cpp
index 22e9fe86d..43e0f5e39 100644
--- a/source/games/exhumed/src/view.cpp
+++ b/source/games/exhumed/src/view.cpp
@@ -100,7 +100,7 @@ static void analyzesprites(tspriteArray& tsprites, const DVector3& view, double
         if ((pTSprite->picnum == kTorch1 || pTSprite->picnum == kTorch2) && (pTSprite->cstat & CSTAT_SPRITE_YCENTER) == 0)
         {
             pTSprite->cstat |= CSTAT_SPRITE_YCENTER;
-            double nTileY = (tileHeight(pTSprite->picnum) * pTSprite->yrepeat) * 2 * zinttoworld;
+            double nTileY = (tileHeight(pTSprite->picnum) * pTSprite->yrepeat) * REPEAT_SCALE * 0.5;
             pTSprite->pos.Z -= nTileY;
         }
 
diff --git a/source/games/exhumed/src/wasp.cpp b/source/games/exhumed/src/wasp.cpp
index 8abad9d2d..06a31adf9 100644
--- a/source/games/exhumed/src/wasp.cpp
+++ b/source/games/exhumed/src/wasp.cpp
@@ -225,7 +225,7 @@ void AIWasp::Tick(RunListEvent* ev)
 
     case 0:
     {
-        pActor->set_int_zvel(bsin(pActor->nAngle, -4));
+        pActor->vel.Z = BobVal(pActor->nAngle) * 4;
 
         pActor->nAngle += pActor->nAngle2;
         pActor->nAngle &= kAngleMask;