FFQuantityItem: Remove unnecessary member variables

fortressforever · Oct 28, 2020 · 0e7b35a · 0e7b35a
1 parent eb74818
commit 0e7b35a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/cl_dll/ff/vgui/ff_quantityitem.cpp b/cl_dll/ff/vgui/ff_quantityitem.cpp
@@ -29,8 +29,6 @@ namespace vgui
 		m_iHeight = 0;
 
 		m_flScale = 1.0f;
-		m_flScaleX = 1.0f;
-		m_flScaleY = 1.0f;
 
 		m_bDisabled = false;
 
@@ -221,13 +219,12 @@ namespace vgui
 		// "map" screen res to 640/480
 		float flScaleX = 1 / (640.0f / iScreenWide);
 		float flScaleY = 1 / (480.0f / iScreenTall);
+		float flScale = (flScaleX <= flScaleY) ? flScaleX : flScaleY;
 
-		if( m_flScaleX != flScaleX || m_flScaleY != flScaleY)
-		// if user changes resolution
+		// if user changed resolution
+		if(m_flScale != flScale)
 		{
-			m_flScaleX = flScaleX;
-			m_flScaleY = flScaleY;
-			m_flScale = ((m_flScaleX <= m_flScaleY) ? m_flScaleX : m_flScaleY);
+			m_flScale = flScale;
 
 			RecalculateIconPosition(false);
 			RecalculateLabelPosition(false);

diff --git a/cl_dll/ff/vgui/ff_quantityitem.h b/cl_dll/ff/vgui/ff_quantityitem.h
@@ -42,8 +42,6 @@ namespace vgui
 		bool m_bDisabled;
 
 		float m_flScale;
-		float m_flScaleX;
-		float m_flScaleY;
 
 	// *** QuantityItem size and paint position offsets ::
 		int m_iWidth;