From 8b9a0da5efe97ee0f8210cf41ba3c3da50789809 Mon Sep 17 00:00:00 2001
From: Randy Heit <rheit@users.noreply.github.com>
Date: Mon, 7 Mar 2016 09:58:52 -0600
Subject: [PATCH] That was hard to read

---
 src/thingdef/thingdef_codeptr.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/thingdef/thingdef_codeptr.cpp b/src/thingdef/thingdef_codeptr.cpp
index 084eebcf9..4cdf31747 100644
--- a/src/thingdef/thingdef_codeptr.cpp
+++ b/src/thingdef/thingdef_codeptr.cpp
@@ -2919,8 +2919,12 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_SetScale)
 
 	if (ref != NULL)
 	{
+		if (scaley == 0 && !usezero)
+		{
+			scaley = scalex;
+		}
 		ref->scaleX = scalex;
-		ref->scaleY = (!usezero && !scaley) ? scalex : scaley;
+		ref->scaleY = scaley;
 	}
 	return 0;
 }