Swap arguments

fortressforever · Oct 18, 2020 · 8e1f36e · 8e1f36e
1 parent d46169d
commit 8e1f36e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/cl_dll/ff/vgui/ff_quantityitem.cpp b/cl_dll/ff/vgui/ff_quantityitem.cpp
@@ -617,37 +617,37 @@ namespace vgui
 	void FFQuantityItem::SetBarColor( Color newBarColor )
 	{ 
 		m_clrBarCustomColor = newBarColor;
-		RecalculateColor(m_iBarColorMode, m_ColorBar, m_clrBarCustomColor);
+		RecalculateColor(m_ColorBar, m_iBarColorMode, m_clrBarCustomColor);
 	}
 
 	void FFQuantityItem::SetBarBorderColor( Color newBarBorderColor ) 
 	{ 
 		m_clrBarBorderCustomColor = newBarBorderColor; 
-		RecalculateColor(m_iBarBorderColorMode, m_ColorBarBorder, m_clrBarBorderCustomColor);
+		RecalculateColor(m_ColorBarBorder, m_iBarBorderColorMode, m_clrBarBorderCustomColor);
 	}
 
 	void FFQuantityItem::SetBarBackgroundColor( Color newBarBackgroundColor ) 
 	{ 
 		m_clrBarBackgroundCustomColor = newBarBackgroundColor; 
-		RecalculateColor(m_iBarBackgroundColorMode, m_ColorBarBackground, m_clrBarBackgroundCustomColor);
+		RecalculateColor(m_ColorBarBackground, m_iBarBackgroundColorMode, m_clrBarBackgroundCustomColor);
 	}
 
 	void FFQuantityItem::SetAmountColor( Color newAmountColor ) 
 	{ 
 		m_clrAmountCustomColor = newAmountColor; 
-		RecalculateColor(m_iAmountColorMode, m_ColorAmount, m_clrAmountCustomColor);
+		RecalculateColor(m_ColorAmount, m_iAmountColorMode, m_clrAmountCustomColor);
 	}
 
 	void FFQuantityItem::SetIconColor( Color newIconColor ) 
 	{ 
 		m_clrIconCustomColor = newIconColor; 
-		RecalculateColor(m_iIconColorMode, m_ColorIcon, m_clrIconCustomColor);
+		RecalculateColor(m_ColorIcon, m_iIconColorMode, m_clrIconCustomColor);
 	}
 
 	void FFQuantityItem::SetLabelColor( Color newLabelColor ) 
 	{ 
 		m_clrLabelCustomColor = newLabelColor; 
-		RecalculateColor(m_iLabelColorMode, m_ColorLabel, m_clrLabelCustomColor);
+		RecalculateColor(m_ColorLabel, m_iLabelColorMode, m_clrLabelCustomColor);
 	}
 
 	void FFQuantityItem::SetTeamColor( Color newTeamColor ) 
@@ -657,67 +657,67 @@ namespace vgui
 			m_ColorTeam = newTeamColor; 
 			if(m_iBarColorMode == ITEM_COLOR_MODE_TEAMCOLORED)
 			{
-				RecalculateColor(m_iBarColorMode, m_ColorBar, m_clrBarCustomColor);
+				RecalculateColor(m_ColorBar, m_iBarColorMode, m_clrBarCustomColor);
 			}
 			if(m_iBarBorderColorMode == ITEM_COLOR_MODE_TEAMCOLORED)
 			{
-				RecalculateColor(m_iBarBorderColorMode, m_ColorBarBorder, m_clrBarBorderCustomColor);
+				RecalculateColor(m_ColorBarBorder, m_iBarBorderColorMode, m_clrBarBorderCustomColor);
 			}
 			if(m_iBarBackgroundColorMode == ITEM_COLOR_MODE_TEAMCOLORED)
 			{
-				RecalculateColor(m_iBarBackgroundColorMode, m_ColorBarBackground, m_clrBarBackgroundCustomColor);
+				RecalculateColor(m_ColorBarBackground, m_iBarBackgroundColorMode, m_clrBarBackgroundCustomColor);
 			}
 			if(m_iIconColorMode == ITEM_COLOR_MODE_TEAMCOLORED)
 			{
-				RecalculateColor(m_iIconColorMode, m_ColorIcon, m_clrIconCustomColor);
+				RecalculateColor(m_ColorIcon, m_iIconColorMode, m_clrIconCustomColor);
 			}
 			if(m_iLabelColorMode == ITEM_COLOR_MODE_TEAMCOLORED)
 			{
-				RecalculateColor(m_iLabelColorMode, m_ColorLabel, m_clrLabelCustomColor);
+				RecalculateColor(m_ColorLabel, m_iLabelColorMode, m_clrLabelCustomColor);
 			}
 			if(m_iAmountColorMode == ITEM_COLOR_MODE_TEAMCOLORED)
 			{
-				RecalculateColor(m_iAmountColorMode, m_ColorAmount, m_clrAmountCustomColor);
+				RecalculateColor(m_ColorAmount, m_iAmountColorMode, m_clrAmountCustomColor);
 			}
 		}
 	}
 
 	void FFQuantityItem::SetBarColorMode( int iColorModeBar ) 
 	{ 
 		m_iBarColorMode = iColorModeBar; 
-		RecalculateColor(m_iBarColorMode, m_ColorBar, m_clrBarCustomColor);
+		RecalculateColor(m_ColorBar, m_iBarColorMode, m_clrBarCustomColor);
 	}
 
 	void FFQuantityItem::SetBarBorderColorMode( int iColorModeBarBorder ) 
 	{
 		m_iBarBorderColorMode = iColorModeBarBorder;
-		RecalculateColor(m_iBarBorderColorMode, m_ColorBarBorder, m_clrBarBorderCustomColor);
+		RecalculateColor(m_ColorBarBorder, m_iBarBorderColorMode, m_clrBarBorderCustomColor);
 	}
 
 	void FFQuantityItem::SetBarBackgroundColorMode( int iColorModeBarBackround ) 
 	{
 		m_iBarBackgroundColorMode = iColorModeBarBackround; 
-		RecalculateColor(m_iBarBackgroundColorMode, m_ColorBarBackground, m_clrBarBackgroundCustomColor);
+		RecalculateColor(m_ColorBarBackground, m_iBarBackgroundColorMode, m_clrBarBackgroundCustomColor);
 	}
 
 	void FFQuantityItem::SetAmountColorMode( int iColorModeAmount ) 
 	{
 
 		m_iAmountColorMode = iColorModeAmount; 
-		RecalculateColor(m_iAmountColorMode, m_ColorAmount, m_clrAmountCustomColor);
+		RecalculateColor(m_ColorAmount, m_iAmountColorMode, m_clrAmountCustomColor);
 	}
 
 	void FFQuantityItem::SetIconColorMode( int iColorModeIcon ) 
 	{ 
 		m_iIconColorMode =  iColorModeIcon;
-		RecalculateColor(m_iIconColorMode, m_ColorIcon, m_clrIconCustomColor);
+		RecalculateColor(m_ColorIcon, m_iIconColorMode, m_clrIconCustomColor);
 
 	}
 
 	void FFQuantityItem::SetLabelColorMode( int iColorModeLabel ) 
 	{ 
 		m_iLabelColorMode = iColorModeLabel; 
-		RecalculateColor(m_iLabelColorMode, m_ColorLabel, m_clrLabelCustomColor);
+		RecalculateColor(m_ColorLabel, m_iLabelColorMode, m_clrLabelCustomColor);
 	}
 
 	void FFQuantityItem::SetAmountPositionOffsetX( int iOffsetXAmount ) 
@@ -1677,7 +1677,7 @@ namespace vgui
 		}
 	}
 
-	void FFQuantityItem::RecalculateColor( int iColorMode, Color &color, Color &colorCustom )
+	void FFQuantityItem::RecalculateColor( Color &color, int iColorMode, Color &colorCustom )
 	{
 		Color rgbColor = GetRgbColor(iColorMode, colorCustom);
 

diff --git a/cl_dll/ff/vgui/ff_quantityitem.h b/cl_dll/ff/vgui/ff_quantityitem.h
@@ -282,7 +282,7 @@ namespace vgui
 		void RecalculateAmountMaxPosition( bool bRecalculatePaintOffset = true );
 		void RecalculatePaintOffset( );
 
-		void RecalculateColor( int iColorMode, Color &color, Color &colorCustom );
+		void RecalculateColor( Color &color, int iColorMode, Color &colorCustom );
 		Color GetRgbColor( int iColorMode, Color &colorCustom );
 		void SetColor( Color &color, Color &rgbColor, Color &alphaColor );
 		void SetIntensityColor( Color &color, int iColorMode, Color &alphaColor );