From 1085752e01efabf28f7c5a16527838066837697b Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Thu, 6 Oct 2022 18:05:31 +0200
Subject: [PATCH] - added more Scale wrappers to spritetype.

---
 source/core/maptypes.h         | 36 ++++++++++++++++++++++++++++++++++
 source/games/sw/src/weapon.cpp |  2 +-
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/source/core/maptypes.h b/source/core/maptypes.h
index 8a08eaec4..162dc366f 100644
--- a/source/core/maptypes.h
+++ b/source/core/maptypes.h
@@ -480,6 +480,42 @@ struct spritetypebase
 		yrepeat = uint8_t(y * (1 / REPEAT_SCALE));
 	}
 
+	void SetScaleX(double x)
+	{
+		xrepeat = uint8_t(x * (1 / REPEAT_SCALE));
+	}
+
+	void SetScaleY(double y)
+	{
+		yrepeat = uint8_t(y * (1 / REPEAT_SCALE));
+	}
+
+	void AddScaleX(double x)
+	{
+		xrepeat += uint8_t(x * (1 / REPEAT_SCALE));
+	}
+
+	void AddScaleY(double y)
+	{
+		yrepeat += uint8_t(y * (1 / REPEAT_SCALE));
+	}
+
+	void MultScaleX(double x)
+	{
+		xrepeat = uint8_t(xrepeat * x);
+	}
+
+	void MultScaleY(double y)
+	{
+		yrepeat = uint8_t(yrepeat * y);
+	}
+
+	void CopyScale(spritetypebase* other)
+	{
+		xrepeat = other->xrepeat;
+		yrepeat = other->yrepeat;
+	}
+
 	double ScaleX() const
 	{
 		return xrepeat  * REPEAT_SCALE;
diff --git a/source/games/sw/src/weapon.cpp b/source/games/sw/src/weapon.cpp
index c91ff970b..3e91900f5 100644
--- a/source/games/sw/src/weapon.cpp
+++ b/source/games/sw/src/weapon.cpp
@@ -18319,7 +18319,7 @@ int DoFloorBlood(DSWActor* actor)
         actor->spr.xrepeat++;
     }
 
-    if (actor->spr.yrepeat < ysiz && actor->spr.xrepeat != xsiz && actor->spr.xrepeat != 4)
+    if (actor->spr.yrepeat < ysiz && actor->spr.xrepeat < xsiz && actor->spr.xrepeat != 4)
     {
         actor->spr.yrepeat++;
     }