From 8ede08ce698c970c7dfcbae1c9b846b4a71b5ca3 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Fri, 7 Oct 2022 19:46:48 +0200
Subject: [PATCH] - mostly coolie related scaling factors.

---
 source/games/sw/src/coolg.cpp  | 15 +++++++--------
 source/games/sw/src/coolie.cpp |  3 +--
 source/games/sw/src/eel.cpp    |  3 +--
 source/games/sw/src/game.h     |  2 +-
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/source/games/sw/src/coolg.cpp b/source/games/sw/src/coolg.cpp
index d4bbecb5b..e1af0615e 100644
--- a/source/games/sw/src/coolg.cpp
+++ b/source/games/sw/src/coolg.cpp
@@ -513,8 +513,7 @@ void CoolgCommon(DSWActor* actor)
 
     actor->user.pos.Z = actor->spr.pos.Z;
 
-    actor->spr.xrepeat = 42;
-    actor->spr.yrepeat = 42;
+	actor->spr.SetScale(0.65625, 0.65625);
     actor->spr.extra |= (SPRX_PLAYER_OR_ENEMY);
 }
 
@@ -793,7 +792,7 @@ int DoCoolgDeath(DSWActor* actor)
 {
     actor->spr.cstat &= ~(CSTAT_SPRITE_TRANSLUCENT);
     actor->spr.cstat &= ~(CSTAT_SPRITE_INVISIBLE);
-    actor->spr.xrepeat = 42;
+    actor->spr.SetScaleX(0.65625);
     actor->spr.shade = -10;
 
     if (actor->user.Flags & (SPR_FALLING))
@@ -871,9 +870,9 @@ int DoCoolgMove(DSWActor* actor)
 
     if (actor->user.FlagOwner-1 == 0)
     {
-        actor->spr.xrepeat--;
+		actor->spr.AddScaleX(-REPEAT_SCALE);
         actor->spr.shade++;
-        if (actor->spr.ScaleX() < 0.0625) actor->spr.xrepeat = 4;
+		if (actor->spr.ScaleX() < 0.0625) actor->spr.SetScaleX(0.0625);
         if (actor->spr.shade > 126)
         {
             actor->spr.shade = 127;
@@ -883,14 +882,14 @@ int DoCoolgMove(DSWActor* actor)
     else if (actor->user.FlagOwner-1 == 2)
     {
         actor->spr.hitag = 0;
-        actor->spr.xrepeat++;
+        actor->spr.AddScaleX(REPEAT_SCALE);
         actor->spr.shade--;
-        if (actor->spr.ScaleX() > 0.65625) actor->spr.xrepeat = 42;
+        if (actor->spr.ScaleX() > 0.65625) actor->spr.SetScaleX(0.65625);
         if (actor->spr.shade < -10) actor->spr.shade = -10;
     }
     else if (actor->user.FlagOwner == 0)
     {
-        actor->spr.xrepeat = 42;
+        actor->spr.SetScaleX(0.65625);
         actor->spr.shade = -10;
         actor->spr.hitag = 0;
     }
diff --git a/source/games/sw/src/coolie.cpp b/source/games/sw/src/coolie.cpp
index 8ec752f83..648f6b197 100644
--- a/source/games/sw/src/coolie.cpp
+++ b/source/games/sw/src/coolie.cpp
@@ -504,8 +504,7 @@ int SetupCoolie(DSWActor* actor)
 
     EnemyDefaults(actor, &CoolieActionSet, &CooliePersonality);
 
-    actor->spr.xrepeat = 42;
-    actor->spr.yrepeat = 42;
+    actor->spr.SetScale(0.65625, 0.65625);
 
     actor->user.Flags |= (SPR_XFLIP_TOGGLE);
 
diff --git a/source/games/sw/src/eel.cpp b/source/games/sw/src/eel.cpp
index 5b1dfffc2..653bdec9e 100644
--- a/source/games/sw/src/eel.cpp
+++ b/source/games/sw/src/eel.cpp
@@ -372,8 +372,7 @@ void EelCommon(DSWActor* actor)
 
     actor->user.pos.Z = actor->spr.pos.Z;
 
-    actor->spr.xrepeat = 35;
-    actor->spr.yrepeat = 27;
+	actor->spr.SetScale(0.546875, 0.421875);
     actor->user.Radius = 400;
 }
 
diff --git a/source/games/sw/src/game.h b/source/games/sw/src/game.h
index cdc62669f..28b742024 100644
--- a/source/games/sw/src/game.h
+++ b/source/games/sw/src/game.h
@@ -2020,7 +2020,7 @@ inline double ActorSizeToTop(DSWActor* a)
 
 inline void SetActorSizeX(DSWActor* sp)
 {
-    sp->clipdist = MulScale(tileWidth(sp->spr.picnum), sp->spr.xrepeat, 6) * 0.25; // ensure proper truncation for this.
+    sp->clipdist = tileWidth(sp->spr.picnum) * sp->spr.ScaleX() * 0.25;
 }
 
 inline bool Facing(DSWActor* actor1, DSWActor* actor2)