Skip to content

[ZH] Fix broken money deposit and withdraw audio and academy income record #1311

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 2 commits into from
Jul 22, 2025
Merged

[ZH] Fix broken money deposit and withdraw audio and academy income record #1311

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0166c94
[ZH] Fix broken money deposit and withdraw audio, academy income record
xezon Jul 19, 2025
25ecc64
Add a comment
xezon Jul 20, 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
18 changes: 10 additions & 8 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 @@ -452,14 +452,16 @@ void Player::init(const PlayerTemplate* pt)

if( m_money.countMoney() == 0 )
{
if ( TheGameInfo )
{
m_money = TheGameInfo->getStartingCash();
}
else
{
m_money = TheGlobalData->m_defaultStartingCash;
}
// TheSuperHacker @bugfix Now correctly deposits the money and fixes its audio and academy issues.
// Note that copying the entire Money class instead would also copy the player index inside of it.
if ( TheGameInfo )
{
m_money.deposit( TheGameInfo->getStartingCash().countMoney(), FALSE );
}
else
{
m_money.deposit( TheGlobalData->m_defaultStartingCash.countMoney(), FALSE );
}
}

m_playerDisplayName.clear();
Expand Down
Loading