From da523eb8e3662b45c61590406429afacbc8247e8 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Fri, 7 Oct 2022 23:48:36 +0200
Subject: [PATCH] - unwrapped vector SetScale.

---
 source/core/maptypes.h              | 5 -----
 source/games/exhumed/src/object.cpp | 2 +-
 source/games/sw/src/draw.cpp        | 4 ++--
 source/games/sw/src/weapon.cpp      | 4 ++--
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/source/core/maptypes.h b/source/core/maptypes.h
index f285a9669..292637333 100644
--- a/source/core/maptypes.h
+++ b/source/core/maptypes.h
@@ -481,11 +481,6 @@ struct spritetypebase
 	{
 		scale = { x, y };
 	}
-
-	void SetScale(const DVector2& p)
-	{
-		scale = p;
-	}
 };
 
 
diff --git a/source/games/exhumed/src/object.cpp b/source/games/exhumed/src/object.cpp
index 791f98766..7b1e84957 100644
--- a/source/games/exhumed/src/object.cpp
+++ b/source/games/exhumed/src/object.cpp
@@ -1414,7 +1414,7 @@ DExhumedActor* BuildSpark(DExhumedActor* pActor, int nVal)
         }
         else
         {
-			pSpark->spr.SetScale(pActor->spr.scale + DVector2(0.234375, 0.234375));
+			pSpark->spr.scale = pActor->spr.scale + DVector2(0.234375, 0.234375);
         }
     }
     else
diff --git a/source/games/sw/src/draw.cpp b/source/games/sw/src/draw.cpp
index 7a7978a97..73c6fbe54 100644
--- a/source/games/sw/src/draw.cpp
+++ b/source/games/sw/src/draw.cpp
@@ -349,7 +349,7 @@ void DoShadows(tspriteArray& tsprites, tspritetype* tsp, double viewz)
 	double scaleofs = (ground_dist - view_dist) * REPEAT_SCALE;
 	scale.X = clamp(scale.X + scaleofs, 0.0625, 4.);
 	scale.Y = clamp(scale.Y + scaleofs, 0.0625, 4.);
-	tSpr->SetScale(scale);
+	tSpr->scale = scale;
 
     if (tilehasmodelorvoxel(tsp->picnum,tsp->pal))
     {
@@ -428,7 +428,7 @@ void DoMotionBlur(tspriteArray& tsprites, tspritetype const * const tsp)
         tSpr->pos += dpos;
         dpos += npos;
 
-        tSpr->SetScale(scale);
+        tSpr->scale = scale;
 
         scale.X -= repeat_adj;
         scale.Y -= repeat_adj;
diff --git a/source/games/sw/src/weapon.cpp b/source/games/sw/src/weapon.cpp
index 6c310e8ae..4c0285e51 100644
--- a/source/games/sw/src/weapon.cpp
+++ b/source/games/sw/src/weapon.cpp
@@ -3811,7 +3811,7 @@ int DoVomit(DSWActor* actor)
     actor->user.Counter = NORM_ANGLE(actor->user.Counter + (30*MISSILEMOVETICS));
     // notreallypos
     auto v = actor->user.pos + mapangle(actor->user.Counter).ToVector() * 12 * REPEAT_SCALE;
-    actor->spr.SetScale(v);
+    actor->spr.scale = v;
     if (actor->user.Flags & (SPR_JUMPING))
     {
         DoJump(actor);
@@ -18353,7 +18353,7 @@ void QueueGeneric(DSWActor* actor, short pic)
     }
 
     actor->spr.picnum = pic;
-    actor->spr.SetScale(scale);
+    actor->spr.scale = scale;
     actor->spr.cstat = 0;
     switch (actor->spr.picnum)
     {