Implement suggestions 2

Author: L3-M

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

@@ -64,24 +64,14 @@ class Money : public Snapshot
 
 public:
 
-	inline Money() : m_money(0), m_playerIndex(0), m_startingCash(0), m_currentBucket(0), m_lastBucketFrame(0)
+	inline Money() : m_playerIndex(0)
 	{
-		for (UnsignedInt i = 0; i < 60; ++i)
-		{
-			m_incomeBuckets[i] = 0;
-		}
+		init();
 	}
 
 	void init()
 	{
-		m_money = 0;
-		m_startingCash = 0;
-		m_currentBucket = 0;
-		m_lastBucketFrame = 0;
-		for (UnsignedInt i = 0; i < 60; ++i)
-		{
-			m_incomeBuckets[i] = 0;
-		}
+		setStartingCash(0);
 	}
 
 	inline UnsignedInt countMoney() const
@@ -120,7 +110,6 @@ class Money : public Snapshot
 
 	UnsignedInt m_money;	///< amount of money
 	Int m_playerIndex;	///< what is my player index?
-	UnsignedInt m_startingCash;
 	UnsignedInt m_incomeBuckets[60];
 	UnsignedInt m_currentBucket;
 	UnsignedInt m_lastBucketFrame;

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

@@ -45,6 +45,7 @@
 #include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
 #include "Common/Money.h"
 #include <numeric>
+#include <algorithm>
 
 #include "Common/AudioSettings.h"
 #include "Common/GameAudio.h"
@@ -88,10 +89,10 @@ void Money::deposit(UnsignedInt amountToDeposit, Bool playSound)
 	if (playSound)
 	{
 		triggerAudioEvent(TheAudio->getMiscAudio()->m_moneyDepositSound);
+		m_incomeBuckets[m_currentBucket] += amountToDeposit;
 	}
 
 	m_money += amountToDeposit;
-	m_incomeBuckets[m_currentBucket] += amountToDeposit;
 
 	if( amountToDeposit > 0 )
 	{
@@ -106,12 +107,10 @@ void Money::deposit(UnsignedInt amountToDeposit, Bool playSound)
 // ------------------------------------------------------------------------------------------------
 void Money::setStartingCash(UnsignedInt amount)
 {
-	m_startingCash = amount;
 	m_money = amount;
 	m_currentBucket = 0;
 	m_lastBucketFrame = 0;
-	for (UnsignedInt i = 0; i < ARRAY_SIZE(m_incomeBuckets); ++i)
-		m_incomeBuckets[i] = 0;
+	std::fill(m_incomeBuckets, m_incomeBuckets + ARRAY_SIZE(m_incomeBuckets), 0u);
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -123,11 +122,17 @@ void Money::updateIncomeBucket()
 	UnsignedInt diff = (curSec > lastSec) ? curSec - lastSec : 0;
 	if (diff > 0)
 	{
-		if (diff > 60)
-			diff = 60;
+		if (diff > ARRAY_SIZE(m_incomeBuckets))
+			diff = ARRAY_SIZE(m_incomeBuckets);
+
+		UnsignedInt next = (m_currentBucket + 1) % ARRAY_SIZE(m_incomeBuckets);
+		UnsignedInt first = std::min(diff, ARRAY_SIZE(m_incomeBuckets) - next);
+		std::fill(m_incomeBuckets + next, m_incomeBuckets + next + first, 0u);
+
+		if (diff > first)
+			std::fill(m_incomeBuckets, m_incomeBuckets + (diff - first), 0u);
+
 		m_currentBucket = (m_currentBucket + diff) % ARRAY_SIZE(m_incomeBuckets);
-		for (UnsignedInt i = 0; i < diff; ++i)
-			m_incomeBuckets[m_currentBucket] = 0;
 	}
 	m_lastBucketFrame = frame;
 }

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

@@ -462,7 +462,6 @@ void Player::init(const PlayerTemplate* pt)
 			{
 				m_money.deposit( TheGlobalData->m_defaultStartingCash.countMoney(), FALSE );
 			}
-			m_money.setStartingCash(m_money.countMoney());
 		}
 
 		m_playerDisplayName.clear();

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

@@ -96,6 +96,40 @@
 static const Real placementOpacity = 0.45f;
 static const RGBColor illegalBuildColor = { 1.0, 0.0, 0.0 };
 
+// ------------------------------------------------------------------------------------------------
+static UnicodeString formatMoneyValue(UnsignedInt amount)
+{
+    UnicodeString result;
+    if (amount >= 100000)
+    {
+        result.format(L"%dk", amount / 1000);
+    }
+    else
+    {
+        result.format(L"%d", amount);
+    }
+    return result;
+}
+
+static UnicodeString formatIncomeValue(UnsignedInt cashPerMin)
+{
+    UnicodeString result;
+    if (cashPerMin >= 10000)
+    {
+        result.format(L"%dk", cashPerMin / 1000);
+    }
+    else if (cashPerMin >= 1000)
+    {
+        UnsignedInt k = cashPerMin / 100;
+        result.format(L"%d.%dk", k / 10, k % 10);
+    }
+    else
+    {
+        result.format(L"%d", cashPerMin);
+    }
+    return result;
+}
+
 //-------------------------------------------------------------------------------------------------
 /// The InGameUI singleton instance.
 InGameUI *TheInGameUI = NULL;
@@ -1877,31 +1911,9 @@ void InGameUI::update( void )
 			if (lastMoney != (Int)currentMoney || lastIncome != (Int)cashPerMin)
 			{
 				UnicodeString buffer;
-				UnicodeString moneyStr;
-				UnicodeString incomeStr;
-
-				if (currentMoney >= 100000)
-				{
-					moneyStr.format(L"%dk", currentMoney / 1000);
-				}
-				else
-				{
-					moneyStr.format(L"%d", currentMoney);
-				}
+				UnicodeString moneyStr = formatMoneyValue(currentMoney);
+				UnicodeString incomeStr = formatIncomeValue(cashPerMin);
 
-				if (cashPerMin >= 10000)
-				{
-					incomeStr.format(L"%dk", cashPerMin / 1000);
-				}
-				else if (cashPerMin >= 1000)
-				{
-					UnsignedInt k = cashPerMin / 100;
-					incomeStr.format(L"%d.%dk", k / 10, k % 10);
-				}
-				else
-				{
-					incomeStr.format(L"%d", cashPerMin);
-				}
 				buffer.format(TheGameText->FETCH_OR_SUBSTITUTE_FORMAT("GUI:ControlBarMoneyDisplayIncome", L"%ls (%ls)", moneyStr.str(), incomeStr.str()));
 				GadgetStaticTextSetText(moneyWin, buffer);
 				lastMoney = currentMoney;