tweak(gui): Configure player money per minute in GameData

L3-M · L3-M · commit 31619717d506 · 2025-11-27T19:36:54.000+03:00
diff --git a/Generals/Code/GameEngine/Include/Common/GlobalData.h b/Generals/Code/GameEngine/Include/Common/GlobalData.h
@@ -410,6 +410,7 @@ class GlobalData : public SubsystemInterface
 
 	// TheSuperHackers @feature L3-M 21/08/2025 toggle the money per minute display, false shows only the original current money
 	Bool m_showMoneyPerMinute;
+	Bool m_allowMoneyPerMinuteForPlayer;
 
 	Real m_shakeSubtleIntensity;			///< Intensity for shaking a camera with SHAKE_SUBTLE
 	Real m_shakeNormalIntensity;			///< Intensity for shaking a camera with SHAKE_NORMAL
diff --git a/Generals/Code/GameEngine/Source/Common/GlobalData.cpp b/Generals/Code/GameEngine/Source/Common/GlobalData.cpp
@@ -442,6 +442,11 @@ GlobalData* GlobalData::m_theOriginal = NULL;
 
 	{	"CameraAudibleRadius",				INI::parseReal,				NULL,			offsetof( GlobalData, m_cameraAudibleRadius ) },
 	{ "GroupMoveClickToGatherAreaFactor", INI::parseReal,	NULL,			offsetof( GlobalData, m_groupMoveClickToGatherFactor ) },
+
+#if !PRESERVE_RETAIL_BEHAVIOR
+	{ "AllowMoneyPerMinuteForPlayer",	INI::parseBool,			NULL,			offsetof( GlobalData, m_allowMoneyPerMinuteForPlayer ) },
+#endif
+
 	{ "ShakeSubtleIntensity",				INI::parseReal,				NULL,			offsetof( GlobalData, m_shakeSubtleIntensity ) },
 	{ "ShakeNormalIntensity",				INI::parseReal,				NULL,			offsetof( GlobalData, m_shakeNormalIntensity ) },
 	{ "ShakeStrongIntensity",				INI::parseReal,				NULL,			offsetof( GlobalData, m_shakeStrongIntensity ) },
@@ -943,6 +948,7 @@ GlobalData::GlobalData()
 	m_gameTimeFontSize = 8;
 
 	m_showMoneyPerMinute = FALSE;
+	m_allowMoneyPerMinuteForPlayer = FALSE;
 
 	m_debugShowGraphicalFramerate = FALSE;
 
diff --git a/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp b/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp
@@ -1880,8 +1880,10 @@ void InGameUI::update( void )
 	if( moneyPlayer)
 	{
 		Money *money = moneyPlayer->getMoney();
-		Bool showIncome = TheGlobalData->m_showMoneyPerMinute;
-		if (!showIncome)
+		Bool wantShowIncome = TheGlobalData->m_showMoneyPerMinute;
+		Bool canShowIncome = TheGlobalData->m_allowMoneyPerMinuteForPlayer || TheControlBar->isObserverControlBarOn();
+		Bool doShowIncome = wantShowIncome && canShowIncome;
+		if (!doShowIncome)
 		{
 			UnsignedInt currentMoney = money->countMoney();
 			if( lastMoney != currentMoney )
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/GlobalData.h b/GeneralsMD/Code/GameEngine/Include/Common/GlobalData.h
@@ -417,6 +417,7 @@ class GlobalData : public SubsystemInterface
 
 	// TheSuperHackers @feature L3-M 21/08/2025 toggle the money per minute display, false shows only the original current money
 	Bool m_showMoneyPerMinute;
+	Bool m_allowMoneyPerMinuteForPlayer;
 
 	Real m_shakeSubtleIntensity;			///< Intensity for shaking a camera with SHAKE_SUBTLE
 	Real m_shakeNormalIntensity;			///< Intensity for shaking a camera with SHAKE_NORMAL
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp b/GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp
@@ -442,6 +442,11 @@ GlobalData* GlobalData::m_theOriginal = NULL;
 
 	{	"CameraAudibleRadius",				INI::parseReal,				NULL,			offsetof( GlobalData, m_cameraAudibleRadius ) },
 	{ "GroupMoveClickToGatherAreaFactor", INI::parseReal,	NULL,			offsetof( GlobalData, m_groupMoveClickToGatherFactor ) },
+
+#if !PRESERVE_RETAIL_BEHAVIOR
+	{ "AllowMoneyPerMinuteForPlayer",	INI::parseBool,			NULL,			offsetof( GlobalData, m_allowMoneyPerMinuteForPlayer ) },
+#endif
+
 	{ "ShakeSubtleIntensity",				INI::parseReal,				NULL,			offsetof( GlobalData, m_shakeSubtleIntensity ) },
 	{ "ShakeNormalIntensity",				INI::parseReal,				NULL,			offsetof( GlobalData, m_shakeNormalIntensity ) },
 	{ "ShakeStrongIntensity",				INI::parseReal,				NULL,			offsetof( GlobalData, m_shakeStrongIntensity ) },
@@ -952,6 +957,7 @@ GlobalData::GlobalData()
 	m_gameTimeFontSize = 8;
 
 	m_showMoneyPerMinute = FALSE;
+	m_allowMoneyPerMinuteForPlayer = FALSE;
 
 	m_debugShowGraphicalFramerate = FALSE;
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp
@@ -1936,8 +1936,10 @@ void InGameUI::update( void )
 	if( moneyPlayer)
 	{
 		Money *money = moneyPlayer->getMoney();
-		Bool showIncome = TheGlobalData->m_showMoneyPerMinute;
-		if (!showIncome)
+		Bool wantShowIncome = TheGlobalData->m_showMoneyPerMinute;
+		Bool canShowIncome = TheGlobalData->m_allowMoneyPerMinuteForPlayer || TheControlBar->isObserverControlBarOn();
+		Bool doShowIncome = wantShowIncome && canShowIncome;
+		if (!doShowIncome)
 		{
 			UnsignedInt currentMoney = money->countMoney();
 			if( lastMoney != currentMoney )

Original file line number	Diff line number	Diff line change
`@@ -1880,8 +1880,10 @@ void InGameUI::update( void )`
`1880`	`1880`	`if( moneyPlayer)`
`1881`	`1881`	`{`
`1882`	`1882`	`Money *money = moneyPlayer->getMoney();`
`1883`		`- Bool showIncome = TheGlobalData->m_showMoneyPerMinute;`
`1884`		`- if (!showIncome)`
	`1883`	`+ Bool wantShowIncome = TheGlobalData->m_showMoneyPerMinute;`
	`1884`	`+ Bool canShowIncome = TheGlobalData->m_allowMoneyPerMinuteForPlayer \|\| TheControlBar->isObserverControlBarOn();`
	`1885`	`+ Bool doShowIncome = wantShowIncome && canShowIncome;`
	`1886`	`+ if (!doShowIncome)`
`1885`	`1887`	`{`
`1886`	`1888`	`UnsignedInt currentMoney = money->countMoney();`
`1887`	`1889`	`if( lastMoney != currentMoney )`
Original file line number	Diff line number	Diff line change
`@@ -1936,8 +1936,10 @@ void InGameUI::update( void )`
`1936`	`1936`	`if( moneyPlayer)`
`1937`	`1937`	`{`
`1938`	`1938`	`Money *money = moneyPlayer->getMoney();`
`1939`		`- Bool showIncome = TheGlobalData->m_showMoneyPerMinute;`
`1940`		`- if (!showIncome)`
	`1939`	`+ Bool wantShowIncome = TheGlobalData->m_showMoneyPerMinute;`
	`1940`	`+ Bool canShowIncome = TheGlobalData->m_allowMoneyPerMinuteForPlayer \|\| TheControlBar->isObserverControlBarOn();`
	`1941`	`+ Bool doShowIncome = wantShowIncome && canShowIncome;`
	`1942`	`+ if (!doShowIncome)`
`1941`	`1943`	`{`
`1942`	`1944`	`UnsignedInt currentMoney = money->countMoney();`
`1943`	`1945`	`if( lastMoney != currentMoney )`