Skip to content

feat(display): Implement player money per minute #1481

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

feat(display): Implement player money per minute #1481

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aa4a814
feat(display): Implement player money per minute
L3-M Aug 21, 2025
4c9114b
Implement suggestions
L3-M Aug 22, 2025
8a09853
Implement suggestions 2
L3-M Aug 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions GeneralsMD/Code/GameEngine/Include/Common/GlobalData.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,9 @@ class GlobalData : public SubsystemInterface
Bool m_saveCameraInReplay;
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;

// 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;
Int m_gameTimeFontSize;
Expand Down
21 changes: 20 additions & 1 deletion GeneralsMD/Code/GameEngine/Include/Common/Money.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,24 @@ class Money : public Snapshot

public:

inline Money() : m_money(0), m_playerIndex(0)
inline Money() : m_money(0), m_playerIndex(0), m_startingCash(0), m_currentBucket(0), m_lastBucketFrame(0)
{
for (UnsignedInt i = 0; i < 60; ++i)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about we just call init() here if that sets everything to 0 already?

{
m_incomeBuckets[i] = 0;
}
}

void init()
{
m_money = 0;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like init() is now synonymous to setStartingCash(0), so that can be simplified.

m_startingCash = 0;
m_currentBucket = 0;
m_lastBucketFrame = 0;
for (UnsignedInt i = 0; i < 60; ++i)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can be simplified/optimized with std::fill

{
m_incomeBuckets[i] = 0;
}
}

inline UnsignedInt countMoney() const
Expand All @@ -82,6 +93,10 @@ class Money : public Snapshot
UnsignedInt withdraw(UnsignedInt amountToWithdraw, Bool playSound = TRUE);
void deposit(UnsignedInt amountToDeposit, Bool playSound = TRUE);

void setStartingCash(UnsignedInt amount);
void updateIncomeBucket();
UnsignedInt getCashPerMinute() const;

void setPlayerIndex(Int ndx) { m_playerIndex = ndx; }

static void parseMoneyAmount( INI *ini, void *instance, void *store, const void* userData );
Expand All @@ -105,6 +120,10 @@ class Money : public Snapshot

UnsignedInt m_money; ///< amount of money
Int m_playerIndex; ///< what is my player index?
UnsignedInt m_startingCash;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is this for? It appears to do nothing.

UnsignedInt m_incomeBuckets[60];
UnsignedInt m_currentBucket;
UnsignedInt m_lastBucketFrame;
};

#endif // _MONEY_H_
Expand Down
1 change: 1 addition & 0 deletions GeneralsMD/Code/GameEngine/Include/Common/UserPreferences.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ class OptionPreferences : public UserPreferences
Bool getFPSLimitEnabled(void);
Bool getNoDynamicLODEnabled(void);
Bool getBuildingOcclusionEnabled(void);
Bool getMoneyPerMinute(void);
Int getParticleCap(void);

Int getCampaignDifficulty(void);
Expand Down
3 changes: 3 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -934,6 +934,8 @@ GlobalData::GlobalData()
m_saveCameraInReplay = FALSE;
m_useCameraInReplay = FALSE;

m_moneyPerMinute = TRUE;

m_systemTimeFontSize = 8;
m_gameTimeFontSize = 8;

Expand Down Expand Up @@ -1203,6 +1205,7 @@ void GlobalData::parseGameDataDefinition( INI* ini )

TheWritableGlobalData->m_systemTimeFontSize = optionPref.getSystemTimeFontSize();
TheWritableGlobalData->m_gameTimeFontSize = optionPref.getGameTimeFontSize();
TheWritableGlobalData->m_moneyPerMinute = optionPref.getMoneyPerMinute();

Int val=optionPref.getGammaValue();
//generate a value between 0.6 and 2.0.
Expand Down
43 changes: 43 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/Common/RTS/Money.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
#include "Common/Player.h"
#include "Common/PlayerList.h"
#include "Common/Xfer.h"
#include "GameLogic/GameLogic.h"

// ------------------------------------------------------------------------------------------------
UnsignedInt Money::withdraw(UnsignedInt amountToWithdraw, Bool playSound)
Expand Down Expand Up @@ -89,6 +90,7 @@ void Money::deposit(UnsignedInt amountToDeposit, Bool playSound)
}

m_money += amountToDeposit;
m_incomeBuckets[m_currentBucket] += amountToDeposit;

if( amountToDeposit > 0 )
{
Expand All @@ -100,6 +102,46 @@ 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 < 60; ++i)
m_incomeBuckets[i] = 0;
}

// ------------------------------------------------------------------------------------------------
void Money::updateIncomeBucket()
{
UnsignedInt frame = TheGameLogic->getFrame();
UnsignedInt lastSec = m_lastBucketFrame / LOGICFRAMES_PER_SECOND;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can this value not be derived from m_currentBucket ?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think so, m_lastBucketFrame records the exact frame of the last update

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But do we care for this frame number? We only care for bucket position, no? I would expect that this logic can be simplified.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

UnsignedInt lastSec = curSec - ((curSec + ARRAY_SIZE(m_incomeBuckets) - m_currentBucket) % ARRAY_SIZE(m_incomeBuckets));

UnsignedInt curSec = frame / LOGICFRAMES_PER_SECOND;
UnsignedInt diff = (curSec > lastSec) ? curSec - lastSec : 0;
if (diff > 0)
{
if (diff > 60)
diff = 60;
for (UnsignedInt i = 0; i < diff; ++i)
{
m_currentBucket = (m_currentBucket + 1) % 60;
m_incomeBuckets[m_currentBucket] = 0;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks wrong now.

Could probably also use std::fill here.

}
}
m_lastBucketFrame = frame;
}

// ------------------------------------------------------------------------------------------------
UnsignedInt Money::getCashPerMinute() const
{
UnsignedInt sum = 0;
for (UnsignedInt i = 0; i < 60; ++i)
sum += m_incomeBuckets[i];
return sum;
}

void Money::triggerAudioEvent(const AudioEventRTS& audioEvent)
{
Real volume = TheAudio->getAudioSettings()->m_preferredMoneyTransactionVolume;
Expand Down Expand Up @@ -157,4 +199,5 @@ void Money::parseMoneyAmount( INI *ini, void *instance, void *store, const void*
// Someday, maybe, have mulitple fields like Gold:10000 Wood:1000 Tiberian:10
Money * money = (Money *)store;
INI::parseUnsignedInt( ini, instance, &money->m_money, userData );
money->setStartingCash(money->m_money);
}
1 change: 1 addition & 0 deletions GeneralsMD/Code/GameEngine/Source/Common/RTS/Player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,6 +462,7 @@ void Player::init(const PlayerTemplate* pt)
{
m_money.deposit( TheGlobalData->m_defaultStartingCash.countMoney(), FALSE );
}
m_money.setStartingCash(m_money.countMoney());
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs another look. First depositing money and then setting starting cash is not good.

It should be one call.

Better design setStartingCash in a way that prior calls to deposit and similar are not necessary.

}

m_playerDisplayName.clear();
Expand Down
1 change: 1 addition & 0 deletions GeneralsMD/Code/GameEngine/Source/Common/RTS/PlayerTemplate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ AsciiString PlayerTemplate::getStartingUnit( Int i ) const
Money *theMoney = (Money *)store;
theMoney->init();
theMoney->deposit( money );
theMoney->setStartingCash(money);

} // end parseStartMoney

Expand Down
22 changes: 22 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -828,6 +828,19 @@ Int OptionPreferences::getGameTimeFontSize(void)
return fontSize;
}

Bool OptionPreferences::getMoneyPerMinute(void)
{
OptionPreferences::const_iterator it = find("MoneyPerMinute");
if (it == end())
return TheGlobalData->m_moneyPerMinute;

if (stricmp(it->second.str(), "yes") == 0)
{
return TRUE;
}
return FALSE;
}

static OptionPreferences *pref = NULL;

static void setDefaults( void )
Expand Down Expand Up @@ -1354,6 +1367,15 @@ static void saveOptions( void )
TheInGameUI->refreshGameTimeResources();
}

//-------------------------------------------------------------------------------------------------
// Set Money Per Minute
{
Bool showIncome = pref->getMoneyPerMinute();
AsciiString prefString;
prefString = showIncome ? "yes" : "no";
(*pref)["MoneyPerMinute"] = prefString;
}

//-------------------------------------------------------------------------------------------------
// Resolution
//
Expand Down
58 changes: 51 additions & 7 deletions GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1837,6 +1837,7 @@ void InGameUI::update( void )
// update the player money window if the money amount has changed
// this seems like as good a place as any to do the power hide/show
static Int lastMoney = -1;
static Int lastIncome = -1;
static NameKeyType moneyWindowKey = TheNameKeyGenerator->nameToKey( "ControlBar.wnd:MoneyDisplay" );
static NameKeyType powerWindowKey = TheNameKeyGenerator->nameToKey( "ControlBar.wnd:PowerWindow" );

Expand All @@ -1852,16 +1853,59 @@ void InGameUI::update( void )
Player* moneyPlayer = TheControlBar->getCurrentlyViewedPlayer();
if( moneyPlayer)
{
Int currentMoney = moneyPlayer->getMoney()->countMoney();
if( lastMoney != currentMoney )
Money *money = moneyPlayer->getMoney();
Bool showIncome = TheGlobalData->m_moneyPerMinute;
if (!showIncome)
{
UnicodeString buffer;
Int currentMoney = money->countMoney();
if( lastMoney != currentMoney )
{
UnicodeString buffer;

buffer.format( TheGameText->fetch( "GUI:ControlBarMoneyDisplay" ), currentMoney );
GadgetStaticTextSetText( moneyWin, buffer );
lastMoney = currentMoney;
buffer.format(TheGameText->fetch( "GUI:ControlBarMoneyDisplay" ), currentMoney );
GadgetStaticTextSetText( moneyWin, buffer );
lastMoney = currentMoney;

} // end if
} // end if
}
else
{
// TheSuperHackers @feature L3-M 21/08/2025 player money per minute
money->updateIncomeBucket();
UnsignedInt currentMoney = money->countMoney();
UnsignedInt cashPerMin = money->getCashPerMinute();
if (lastMoney != (Int)currentMoney || lastIncome != (Int)cashPerMin)
{
UnicodeString buffer;
UnicodeString moneyStr;
UnicodeString incomeStr;
if (currentMoney >= 100000)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This code portion can become prettier by breaking out the money values formatting:

UnicodeString moneyStr = formatMoneyValue(currentMoney);
UnicodeString incomeStr = formatIncomeValue(cashPerMin);

{
moneyStr.format(L"%dK", currentMoney / 1000);
}
else
{
moneyStr.format(L"%d", currentMoney);
}
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()));
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about the Money symbol?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The limitation here would be the ControlBarPro money texture. It has much less space compared to the original game's ControlBar, hence I removed it

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you show image for it?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes.
1920x1080. Money symbol and ControlBarPro:
1920x1080ControlBarPro2-2

1920x1080. No money symbol and ControlBarPro:
1920x1080ControlBarPro2

1920x1080. Money symbol with Mauller font scaling and ControlBarPro:
1920x1080ControlBarPro1_1

1920x1080. Money symbol and original ControlBar:
1920x1080ControlBar

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You tested Control Bar Pro correctly in 16:9.

The Original Control Bar always needs to be tested in 4:3. That is because its elements are stretched wide in 16:9 and beyond.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oof it seems to be broken on ControlBar too in 4:3, we can drop the brackets or not use the money symbol.

Image

Image

GadgetStaticTextSetText(moneyWin, buffer);
lastMoney = currentMoney;
lastIncome = cashPerMin;
}
}
moneyWin->winHide(FALSE);
powerWin->winHide(FALSE);
}
Expand Down
Loading