Skip to content

Commit b607516

Browse files
committed
bugfix: Fix hardcoded cash hack value for Black Lotus
1 parent 0a05454 commit b607516

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

Generals/Code/GameEngine/Source/GameLogic/Object/Update/SpecialAbilityUpdate.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1339,14 +1339,18 @@ void SpecialAbilityUpdate::triggerAbilityEffect()
13391339
return;
13401340
}
13411341

1342-
//Steal a thousand cash from the other team!
1342+
//Steal cash from the other team!
13431343
Money *targetMoney = target->getControllingPlayer()->getMoney();
13441344
Money *objectMoney = object->getControllingPlayer()->getMoney();
13451345
if( targetMoney && objectMoney )
13461346
{
13471347
UnsignedInt cash = targetMoney->countMoney();
1348+
#if RETAIL_COMPATIBLE_CRC
13481349
UnsignedInt desiredAmount = 1000;
1349-
//Check to see if they have 1000 cash, otherwise, take the remainder!
1350+
#else
1351+
UnsignedInt desiredAmount = data->m_effectValue;
1352+
#endif
1353+
//Check to see if they have the cash, otherwise, take the remainder!
13501354
cash = min( desiredAmount, cash );
13511355
if( cash > 0 )
13521356
{

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpecialAbilityUpdate.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1485,14 +1485,18 @@ void SpecialAbilityUpdate::triggerAbilityEffect()
14851485
return;
14861486
}
14871487

1488-
//Steal a thousand cash from the other team!
1488+
//Steal cash from the other team!
14891489
Money *targetMoney = target->getControllingPlayer()->getMoney();
14901490
Money *objectMoney = object->getControllingPlayer()->getMoney();
14911491
if( targetMoney && objectMoney )
14921492
{
14931493
UnsignedInt cash = targetMoney->countMoney();
1494+
#if RETAIL_COMPATIBLE_CRC
14941495
UnsignedInt desiredAmount = 1000;
1495-
//Check to see if they have 1000 cash, otherwise, take the remainder!
1496+
#else
1497+
UnsignedInt desiredAmount = data->m_effectValue;
1498+
#endif
1499+
//Check to see if they have the cash, otherwise, take the remainder!
14961500
cash = min( desiredAmount, cash );
14971501
if( cash > 0 )
14981502
{

0 commit comments

Comments
 (0)