Skip to content

tweak(gui): Add configuration to GameData.ini to allow Money Per Minute for players #1914

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

Merged
merged 1 commit into from
Nov 27, 2025
Merged

tweak(gui): Add configuration to GameData.ini to allow Money Per Minute for players #1914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions Generals/Code/GameEngine/Include/Common/GlobalData.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions Generals/Code/GameEngine/Source/Common/GlobalData.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ) },
Expand Down Expand Up @@ -943,6 +948,7 @@ GlobalData::GlobalData()
m_gameTimeFontSize = 8;

m_showMoneyPerMinute = FALSE;
m_allowMoneyPerMinuteForPlayer = FALSE;

m_debugShowGraphicalFramerate = FALSE;

Expand Down
6 changes: 4 additions & 2 deletions Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down
1 change: 1 addition & 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 @@ -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
Expand Down
6 changes: 6 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 @@ -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 ) },
Expand Down Expand Up @@ -952,6 +957,7 @@ GlobalData::GlobalData()
m_gameTimeFontSize = 8;

m_showMoneyPerMinute = FALSE;
m_allowMoneyPerMinuteForPlayer = FALSE;

m_debugShowGraphicalFramerate = FALSE;

Expand Down
6 changes: 4 additions & 2 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 @@ -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 )
Expand Down
Loading