Skip to content

bugfix(behavior): Fix hardcoded cash hack value for Black Lotus #1601

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
Sep 19, 2025
+12 −4
Merged

bugfix(behavior): Fix hardcoded cash hack value for Black Lotus #1601

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
8 changes: 6 additions & 2 deletions Generals/Code/GameEngine/Source/GameLogic/Object/Update/SpecialAbilityUpdate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1339,14 +1339,18 @@ void SpecialAbilityUpdate::triggerAbilityEffect()
return;
}

//Steal a thousand cash from the other team!
//Steal cash from the other team!
Money *targetMoney = target->getControllingPlayer()->getMoney();
Money *objectMoney = object->getControllingPlayer()->getMoney();
if( targetMoney && objectMoney )
{
UnsignedInt cash = targetMoney->countMoney();
#if RETAIL_COMPATIBLE_CRC
UnsignedInt desiredAmount = 1000;
//Check to see if they have 1000 cash, otherwise, take the remainder!
#else
UnsignedInt desiredAmount = data->m_effectValue;
#endif
//Check to see if they have the cash, otherwise, take the remainder!
cash = min( desiredAmount, cash );
if( cash > 0 )
{
Expand Down
8 changes: 6 additions & 2 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpecialAbilityUpdate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1485,14 +1485,18 @@ void SpecialAbilityUpdate::triggerAbilityEffect()
return;
}

//Steal a thousand cash from the other team!
//Steal cash from the other team!
Money *targetMoney = target->getControllingPlayer()->getMoney();
Money *objectMoney = object->getControllingPlayer()->getMoney();
if( targetMoney && objectMoney )
{
UnsignedInt cash = targetMoney->countMoney();
#if RETAIL_COMPATIBLE_CRC
UnsignedInt desiredAmount = 1000;
//Check to see if they have 1000 cash, otherwise, take the remainder!
#else
UnsignedInt desiredAmount = data->m_effectValue;
#endif
//Check to see if they have the cash, otherwise, take the remainder!
cash = min( desiredAmount, cash );
if( cash > 0 )
{
Expand Down
Loading