Implement suggestions

Author: L3-M

GeneralsMD/Code/GameEngine/Include/Common/GlobalData.h

@@ -406,7 +406,7 @@ class GlobalData : public SubsystemInterface
 	Bool m_useCameraInReplay;
 
 	// TheSuperHackers @feature L3-M 21/08/2025 toggle the money per minute display; 'no' shows only the original current money
-	Bool m_moneyPerMinute;
+	Bool m_showMoneyPerMinute;
 
 	// TheSuperHackers @feature Mauller 21/06/2025 allow the system time and game time font size to be set, a size of zero disables them
 	Int m_systemTimeFontSize;

GeneralsMD/Code/GameEngine/Include/Common/UserPreferences.h

@@ -128,7 +128,7 @@ class OptionPreferences : public UserPreferences
 	Bool getFPSLimitEnabled(void);
 	Bool getNoDynamicLODEnabled(void);
 	Bool getBuildingOcclusionEnabled(void);
-	Bool getMoneyPerMinute(void);
+	Bool getShowMoneyPerMinute(void);
 	Int getParticleCap(void);
 
 	Int	 getCampaignDifficulty(void);

GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp

@@ -934,7 +934,7 @@ GlobalData::GlobalData()
 	m_saveCameraInReplay = FALSE;
 	m_useCameraInReplay = FALSE;
 
-	m_moneyPerMinute = TRUE;
+	m_showMoneyPerMinute = FALSE;
 
 	m_systemTimeFontSize = 8;
 	m_gameTimeFontSize = 8;
@@ -1205,7 +1205,7 @@ void GlobalData::parseGameDataDefinition( INI* ini )
 
 	TheWritableGlobalData->m_systemTimeFontSize = optionPref.getSystemTimeFontSize();
 	TheWritableGlobalData->m_gameTimeFontSize = optionPref.getGameTimeFontSize();
-	TheWritableGlobalData->m_moneyPerMinute = optionPref.getMoneyPerMinute();
+	TheWritableGlobalData->m_showMoneyPerMinute = optionPref.getShowMoneyPerMinute();
 
 	Int val=optionPref.getGammaValue();
 	//generate a value between 0.6 and 2.0.

GeneralsMD/Code/GameEngine/Source/Common/RTS/Money.cpp

@@ -44,6 +44,7 @@
 
 #include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
 #include "Common/Money.h"
+#include <numeric>
 
 #include "Common/AudioSettings.h"
 #include "Common/GameAudio.h"
@@ -109,7 +110,7 @@ void Money::setStartingCash(UnsignedInt amount)
 	m_money = amount;
 	m_currentBucket = 0;
 	m_lastBucketFrame = 0;
-	for (UnsignedInt i = 0; i < 60; ++i)
+	for (UnsignedInt i = 0; i < ARRAY_SIZE(m_incomeBuckets); ++i)
 		m_incomeBuckets[i] = 0;
 }
 
@@ -124,22 +125,17 @@ void Money::updateIncomeBucket()
 	{
 		if (diff > 60)
 			diff = 60;
+		m_currentBucket = (m_currentBucket + diff) % ARRAY_SIZE(m_incomeBuckets);
 		for (UnsignedInt i = 0; i < diff; ++i)
-		{
-			m_currentBucket = (m_currentBucket + 1) % 60;
 			m_incomeBuckets[m_currentBucket] = 0;
-		}
 	}
 	m_lastBucketFrame = frame;
 }
 
 // ------------------------------------------------------------------------------------------------
 UnsignedInt Money::getCashPerMinute() const
 {
-	UnsignedInt sum = 0;
-	for (UnsignedInt i = 0; i < 60; ++i)
-		sum += m_incomeBuckets[i];
-	return sum;
+	return std::accumulate(m_incomeBuckets, m_incomeBuckets + ARRAY_SIZE(m_incomeBuckets), 0u);
 }
 
 void Money::triggerAudioEvent(const AudioEventRTS& audioEvent)

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp

@@ -828,11 +828,11 @@ Int OptionPreferences::getGameTimeFontSize(void)
 	return fontSize;
 }
 
-Bool OptionPreferences::getMoneyPerMinute(void)
+Bool OptionPreferences::getShowMoneyPerMinute(void)
 {
-	OptionPreferences::const_iterator it = find("MoneyPerMinute");
+	OptionPreferences::const_iterator it = find("ShowMoneyPerMinute");
 	if (it == end())
-		return TheGlobalData->m_moneyPerMinute;
+		return TheGlobalData->m_showMoneyPerMinute;
 
 	if (stricmp(it->second.str(), "yes") == 0)
 	{
@@ -1370,10 +1370,10 @@ static void saveOptions( void )
 	//-------------------------------------------------------------------------------------------------
 	// Set Money Per Minute
 	{
-		Bool showIncome = pref->getMoneyPerMinute();
+		Bool showIncome = pref->getShowMoneyPerMinute();
 		AsciiString prefString;
 		prefString = showIncome ? "yes" : "no";
-		(*pref)["MoneyPerMinute"] = prefString;
+		(*pref)["ShowMoneyPerMinute"] = prefString;
 	}
 
 	//-------------------------------------------------------------------------------------------------

GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp

@@ -1854,7 +1854,7 @@ void InGameUI::update( void )
 	if( moneyPlayer)
 	{
 		Money *money = moneyPlayer->getMoney();
-		Bool showIncome = TheGlobalData->m_moneyPerMinute;
+		Bool showIncome = TheGlobalData->m_showMoneyPerMinute;
 		if (!showIncome)
 		{
 			Int currentMoney = money->countMoney();
@@ -1879,22 +1879,24 @@ void InGameUI::update( void )
 				UnicodeString buffer;
 				UnicodeString moneyStr;
 				UnicodeString incomeStr;
+
 				if (currentMoney >= 100000)
 				{
-					moneyStr.format(L"%dK", currentMoney / 1000);
+					moneyStr.format(L"%dk", currentMoney / 1000);
 				}
 				else
 				{
 					moneyStr.format(L"%d", currentMoney);
 				}
+
 				if (cashPerMin >= 10000)
 				{
-					incomeStr.format(L"%dK", cashPerMin / 1000);
+					incomeStr.format(L"%dk", cashPerMin / 1000);
 				}
 				else if (cashPerMin >= 1000)
 				{
 					UnsignedInt k = cashPerMin / 100;
-					incomeStr.format(L"%d.%dK", k / 10, k % 10);
+					incomeStr.format(L"%d.%dk", k / 10, k % 10);
 				}
 				else
 				{