From 90e76683ca634f8e688fee5f1ed1322c7a3b7f72 Mon Sep 17 00:00:00 2001 From: L3-M <100478094+L3-M@users.noreply.github.com> Date: Sat, 1 Nov 2025 17:27:05 +0300 Subject: [PATCH] tweak(gui): track money per minute for every player --- Generals/Code/GameEngine/Source/Common/RTS/Player.cpp | 2 ++ Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp | 1 - GeneralsMD/Code/GameEngine/Source/Common/RTS/Player.cpp | 2 ++ GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp | 1 - 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Generals/Code/GameEngine/Source/Common/RTS/Player.cpp b/Generals/Code/GameEngine/Source/Common/RTS/Player.cpp index 49e13c02e4d..c533b95b31d 100644 --- a/Generals/Code/GameEngine/Source/Common/RTS/Player.cpp +++ b/Generals/Code/GameEngine/Source/Common/RTS/Player.cpp @@ -684,6 +684,8 @@ void Player::update() if (tunnelSystem) tunnelSystem->healObjects(); #endif + + m_money.updateIncomeBucket(); } //============================================================================= diff --git a/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp b/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp index f51e726e373..72941c4c1b5 100644 --- a/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp @@ -1898,7 +1898,6 @@ void InGameUI::update( void ) else { // TheSuperHackers @feature L3-M 21/08/2025 player money per minute - money->updateIncomeBucket(); UnsignedInt currentMoney = money->countMoney(); UnsignedInt cashPerMin = money->getCashPerMinute(); if ( lastMoney != currentMoney || lastIncome != cashPerMin ) diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RTS/Player.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/Player.cpp index 7add71ac2a4..4190cb77c38 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/RTS/Player.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/RTS/Player.cpp @@ -724,6 +724,8 @@ void Player::update() if (tunnelSystem) tunnelSystem->healObjects(); #endif + + m_money.updateIncomeBucket(); } //============================================================================= diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp index 2605d4155f7..9e0f08f3854 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp @@ -1954,7 +1954,6 @@ void InGameUI::update( void ) else { // TheSuperHackers @feature L3-M 21/08/2025 player money per minute - money->updateIncomeBucket(); UnsignedInt currentMoney = money->countMoney(); UnsignedInt cashPerMin = money->getCashPerMinute(); if ( lastMoney != currentMoney || lastIncome != cashPerMin )