From 4321beca2dc1df55ca52b3bc574b6793e2534083 Mon Sep 17 00:00:00 2001
From: spherallic <spherallic@gmail.com>
Date: Mon, 6 Feb 2023 11:08:00 +0100
Subject: [PATCH] Fixed "fixed things scale" option behaving weirdly

---
 Source/Core/Map/MapSet.cs           |  4 ++--
 Source/Core/Rendering/Renderer2D.cs | 17 ++++++++---------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/Source/Core/Map/MapSet.cs b/Source/Core/Map/MapSet.cs
index 6f67fe4..991d8d1 100644
--- a/Source/Core/Map/MapSet.cs
+++ b/Source/Core/Map/MapSet.cs
@@ -3544,8 +3544,8 @@ namespace CodeImp.DoomBuilder.Map
 				float ts;
 				if(t.FixedSize && General.Map.Renderer2D.Scale > 1.0f)
 					ts = t.Size / General.Map.Renderer2D.Scale;
-				else if(General.Settings.FixedThingsScale && t.Size * General.Map.Renderer2D.Scale > Renderer2D.FIXED_THING_SIZE)
-					ts = Renderer2D.FIXED_THING_SIZE / General.Map.Renderer2D.Scale;
+				else if(General.Settings.FixedThingsScale)
+					ts = General.Map.Renderer2D.Scale;
 				else
 					ts = t.Size;
 
diff --git a/Source/Core/Rendering/Renderer2D.cs b/Source/Core/Rendering/Renderer2D.cs
index 9050c96..24b7875 100644
--- a/Source/Core/Rendering/Renderer2D.cs
+++ b/Source/Core/Rendering/Renderer2D.cs
@@ -52,7 +52,6 @@ namespace CodeImp.DoomBuilder.Rendering
 		private const int THING_BUFFER_SIZE = 100;
 		private const float MINIMUM_THING_RADIUS = 1.5f; //mxd
 		private const float MINIMUM_SPRITE_RADIUS = 8.0f; //mxd
-		internal const float FIXED_THING_SIZE = 48.0f; //mxd
 
 		internal const int NUM_VIEW_MODES = 4;
         #endregion
@@ -963,17 +962,17 @@ namespace CodeImp.DoomBuilder.Rendering
 
 			if(t.FixedSize && scale > 1.0f)
 			{
-				circlesize = t.Size;
+				circlesize = thingsize;
 				bboxsize = -1;
 			}
-			else if(General.Settings.FixedThingsScale && t.Size * scale > FIXED_THING_SIZE)
+			else if(General.Settings.FixedThingsScale)
 			{
-				circlesize = FIXED_THING_SIZE;
+				circlesize = thingsize;
 				bboxsize = t.Size * scale;
 			}
 			else
 			{
-				circlesize = t.Size * scale;
+				circlesize = thingsize * scale;
 				bboxsize = -1;
 			}
 
@@ -1050,8 +1049,8 @@ namespace CodeImp.DoomBuilder.Rendering
 			float arrowsize;
 			if(t.FixedSize && scale > 1.0f)
 				arrowsize = thingsize * THING_ARROW_SIZE;
-			else if(General.Settings.FixedThingsScale && thingsize * scale > FIXED_THING_SIZE)
-				arrowsize = FIXED_THING_SIZE * THING_ARROW_SIZE;
+			else if(General.Settings.FixedThingsScale)
+				arrowsize = thingsize * THING_ARROW_SIZE;
 			else
 				arrowsize = thingsize * scale * THING_ARROW_SIZE;
 
@@ -1288,9 +1287,9 @@ namespace CodeImp.DoomBuilder.Rendering
 							spritescale = 1.0f;
 							forcespriterendering = true; // Always render sprite when thing size is affected by FixedSize setting
 						}
-						else if(General.Settings.FixedThingsScale && t.Size * scale > FIXED_THING_SIZE)
+						else if(General.Settings.FixedThingsScale)
 						{
-							spritescale =  FIXED_THING_SIZE / t.Size;
+							spritescale =  1.0f;
 							forcespriterendering = true; // Always render sprite when thing size is affected by FixedThingsScale setting
 						}
 						else