FFQuantityItem: Invert default boolean value on public methods

fortressforever · Oct 18, 2020 · ac8e3c0 · ac8e3c0
1 parent d867e9b
commit ac8e3c0
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 21 deletions.
diff --git a/cl_dll/ff/ff_hud_buildstate_detpack.cpp b/cl_dll/ff/ff_hud_buildstate_detpack.cpp
@@ -56,8 +56,8 @@ void CHudBuildStateDetpack::VidInit()
 	if (!m_wszBuildingText) 
 		m_wszBuildingText = L"Building...";
 
-	m_qiDetpackTimeLeft->SetLabelText("#FF_ITEM_TIMELEFT", false);
-	m_qiDetpackTimeLeft->SetIconChar("f", false);
+	m_qiDetpackTimeLeft->SetLabelText("#FF_ITEM_TIMELEFT");
+	m_qiDetpackTimeLeft->SetIconChar("f");
 	m_qiDetpackTimeLeft->SetIntensityAmountScaled(true);//max changes (is not 100) so we need to scale to a percentage amount for calculation
 	m_qiDetpackTimeLeft->SetAmount(0);
 	HideItem(m_qiDetpackTimeLeft);

diff --git a/cl_dll/ff/ff_hud_buildstate_dispenser.cpp b/cl_dll/ff/ff_hud_buildstate_dispenser.cpp
@@ -57,18 +57,18 @@ void CHudBuildStateDispenser::VidInit()
 	if (!m_wszBuildingText) 
 		m_wszBuildingText = L"Building...";
 
-	m_qiDispenserHealth->SetLabelText("#FF_ITEM_HEALTH", false);
-	m_qiDispenserHealth->SetIconChar("a", false);
+	m_qiDispenserHealth->SetLabelText("#FF_ITEM_HEALTH");
+	m_qiDispenserHealth->SetIconChar("a");
 	m_qiDispenserHealth->ShowAmountMax(false);
 	HideItem(m_qiDispenserAmmo);	
 
-	m_qiDispenserAmmo->SetLabelText("#FF_ITEM_AMMO", false);
-	m_qiDispenserAmmo->SetIconChar("r", false);
+	m_qiDispenserAmmo->SetLabelText("#FF_ITEM_AMMO");
+	m_qiDispenserAmmo->SetIconChar("r");
 	m_qiDispenserAmmo->ShowAmountMax(false);
 	HideItem(m_qiDispenserHealth);
 
-	m_qiCellCounter->SetLabelText("#FF_ITEM_CELLS", false);
-	m_qiCellCounter->SetIconChar("p", false);
+	m_qiCellCounter->SetLabelText("#FF_ITEM_CELLS");
+	m_qiCellCounter->SetIconChar("p");
 	m_qiCellCounter->SetIntensityControl(0, (int)(FF_BUILDCOST_DISPENSER/3), (int)(FF_BUILDCOST_DISPENSER/3) * 2, FF_BUILDCOST_DISPENSER);
 	m_qiCellCounter->SetAmountMax(FF_BUILDCOST_DISPENSER);
 

diff --git a/cl_dll/ff/ff_hud_buildstate_mancannon.cpp b/cl_dll/ff/ff_hud_buildstate_mancannon.cpp
@@ -56,8 +56,8 @@ void CHudBuildStateManCannon::VidInit()
 	if (!m_wszBuildingText) 
 		m_wszBuildingText = L"Building...";
 
-	m_qiManCannonHealth->SetLabelText("#FF_ITEM_HEALTH", false);
-	m_qiManCannonHealth->SetIconChar("a", false);
+	m_qiManCannonHealth->SetLabelText("#FF_ITEM_HEALTH");
+	m_qiManCannonHealth->SetIconChar("a");
 	m_qiManCannonHealth->ShowAmountMax(false);
 	m_qiManCannonHealth->SetAmount(0);
 	HideItem(m_qiManCannonHealth);

diff --git a/cl_dll/ff/ff_hud_buildstate_pipe.cpp b/cl_dll/ff/ff_hud_buildstate_pipe.cpp
@@ -57,8 +57,8 @@ void CHudBuildStatePipe::VidInit()
 		m_wszNotBuiltText = L"Not Built";
 	SetText(m_wszNotBuiltText, false);
 
-	m_qiPipeLaid->SetLabelText("#FF_ITEM_PIPES", false);
-	m_qiPipeLaid->SetIconChar("o", false);
+	m_qiPipeLaid->SetLabelText("#FF_ITEM_PIPES");
+	m_qiPipeLaid->SetIconChar("o");
 	m_qiPipeLaid->SetIntensityAmountScaled(true);//max changes (is not 100) so we need to scale to a percentage amount for calculation
 	m_qiPipeLaid->SetAmount(0);
 	m_qiPipeLaid->SetAmountMax(8);

diff --git a/cl_dll/ff/ff_hud_buildstate_sentry.cpp b/cl_dll/ff/ff_hud_buildstate_sentry.cpp
@@ -200,22 +200,22 @@ void CHudBuildStateSentry::VidInit()
 	if (!m_wszBuildingText) 
 		m_wszBuildingText = L"Building...";
 
-	m_qiSentryHealth->SetLabelText("#FF_ITEM_HEALTH", false);
-	m_qiSentryHealth->SetIconChar("a", false);
+	m_qiSentryHealth->SetLabelText("#FF_ITEM_HEALTH");
+	m_qiSentryHealth->SetIconChar("a");
 	m_qiSentryHealth->SetIntensityAmountScaled(true);//max changes (is not 100) so we need to scale to a percentage amount for calculation
 	m_qiSentryHealth->SetAmount(0);
 	HideItem(m_qiSentryHealth);
 
-	m_qiSentryLevel->SetLabelText("#FF_ITEM_LEVEL", false);
-	m_qiSentryLevel->SetIconChar("d", false);
+	m_qiSentryLevel->SetLabelText("#FF_ITEM_LEVEL");
+	m_qiSentryLevel->SetIconChar("d");
 	m_qiSentryLevel->SetAmountMax(3);
 	m_qiSentryLevel->SetIntensityControl(1,2,2,3);
 	m_qiSentryLevel->SetIntensityValuesFixed(true);
 	m_qiSentryLevel->SetAmount(0);
 	HideItem(m_qiSentryLevel);
 
-	m_qiCellCounter->SetLabelText("#FF_ITEM_CELLS", false);
-	m_qiCellCounter->SetIconChar("p", false);
+	m_qiCellCounter->SetLabelText("#FF_ITEM_CELLS");
+	m_qiCellCounter->SetIconChar("p");
 	m_qiCellCounter->SetIntensityControl(0, (int)(FF_BUILDCOST_SENTRYGUN/3), (int)(FF_BUILDCOST_SENTRYGUN/3) * 2, FF_BUILDCOST_SENTRYGUN);
 	m_qiCellCounter->SetAmountMax(FF_BUILDCOST_SENTRYGUN);
 	m_iMaxCells = FF_BUILDCOST_SENTRYGUN;

diff --git a/cl_dll/ff/vgui/ff_quantityitem.h b/cl_dll/ff/vgui/ff_quantityitem.h
@@ -331,10 +331,10 @@ namespace vgui
 		void SetStyle(KeyValues *kvStyleData, KeyValues *kvDefaultStyleData );
 
 		void SetAmount( int iAmount );
-		void SetAmountMax( int iAmountMax, bool bRecalculatePaintOffset = true );
+		void SetAmountMax( int iAmountMax, bool bRecalculatePaintOffset = false );
 
-		void SetIconChar(char *newIconChar, bool bRecalculatePaintOffset = true );
-		void SetLabelText(char *newLabelText, bool bRecalculatePaintOffset = true );
+		void SetIconChar(char *newIconChar, bool bRecalculatePaintOffset = false );
+		void SetLabelText(char *newLabelText, bool bRecalculatePaintOffset = false );
 
 		void SetIntensityControl( int iRed, int iOrange,int iYellow, int iGreen, bool bInvertScale = false );
 		void SetIntensityAmountScaled( bool bAmountScaled );