1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-19 14:20:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

remove unused TransferFundsFromBankToMerc/MercToBank

Browse Source
This commit is contained in:
Marco Antonio J. Costa
2025-10-08 03:07:23 -03:00
committed by majcosta
parent 3af3b3fbbc
commit b1ccdf4e38
2 changed files with 0 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/personnel.cpp
-90
View File
@@ -5895,96 +5895,6 @@ INT32 GetFundsOnMerc( SOLDIERTYPE *pSoldier )
return iCurrentAmount; return iCurrentAmount;
} }
BOOLEAN TransferFundsFromMercToBank( SOLDIERTYPE *pSoldier, INT32 iCurrentBalance )
{
// move this amount of money from the grunt to the bank
// error check
if( pSoldier == NULL )
{
return FALSE;
}
UINT32 iCurrentPocket = 0;
INT32 iAmountLeftToTake = iCurrentBalance;
// run through grunts pockets and count all the spare change
UINT32 invsize = pSoldier->inv.size();
for( iCurrentPocket = 0; iCurrentPocket < invsize; ++iCurrentPocket )
{
if ( Item[ pSoldier->inv[ iCurrentPocket ] .usItem ].usItemClass == IC_MONEY )
{
// is there more left to go, or does this pocket finish it off?
if( pSoldier->inv[ iCurrentPocket ][0]->data.money.uiMoneyAmount > ( UINT32 )iAmountLeftToTake )
{
pSoldier->inv[ iCurrentPocket ][0]->data.money.uiMoneyAmount -= iAmountLeftToTake;
iAmountLeftToTake = 0;
}
else
{
iAmountLeftToTake -= pSoldier->inv[ iCurrentPocket ][0]->data.money.uiMoneyAmount;
pSoldier->inv[ iCurrentPocket ][0]->data.money.uiMoneyAmount = 0;
//Remove the item out off the merc
DeleteObj(&pSoldier->inv[iCurrentPocket]);
}
}
}
if( iAmountLeftToTake != 0 )
{
// something wrong
AddTransactionToPlayersBook ( TRANSFER_FUNDS_FROM_MERC, pSoldier->ubProfile, GetWorldTotalMin() , ( iCurrentBalance - iAmountLeftToTake ) );
return ( FALSE );
}
else
{
// everything ok
AddTransactionToPlayersBook ( TRANSFER_FUNDS_FROM_MERC, pSoldier->ubProfile, GetWorldTotalMin() , ( iCurrentBalance ) );
return ( TRUE );
}
}
BOOLEAN TransferFundsFromBankToMerc( SOLDIERTYPE *pSoldier, INT32 iCurrentBalance )
{
// move this amount of money from the grunt to the bank
// error check
if( pSoldier == NULL )
{
return FALSE;
}
// make sure we are giving them some money
if( iCurrentBalance <= 0 )
{
return ( FALSE );
}
// current balance
if( iCurrentBalance > LaptopSaveInfo.iCurrentBalance )
{
iCurrentBalance = LaptopSaveInfo.iCurrentBalance;
}
// set up money object
CreateMoney(iCurrentBalance, &gTempObject);
// now auto place money object
if( AutoPlaceObject( pSoldier, &( gTempObject ), TRUE ) == TRUE )
{
// now place transaction
AddTransactionToPlayersBook ( TRANSFER_FUNDS_TO_MERC, pSoldier->ubProfile, GetWorldTotalMin() , -( iCurrentBalance ) );
}
else
{
// error, notify player that merc doesn't have the spce for this much cash
}
return( TRUE );
}
void UpDateStateOfStartButton( void ) void UpDateStateOfStartButton( void )
{ {
if (!showPersonnelButtons) if (!showPersonnelButtons)
Laptop/personnel.h
-3
View File
@@ -74,9 +74,6 @@ void AddCharacterToFiredList( SOLDIERTYPE *pSoldier );
// get the total amt of money on this guy // get the total amt of money on this guy
INT32 GetFundsOnMerc( SOLDIERTYPE *pSoldier ); INT32 GetFundsOnMerc( SOLDIERTYPE *pSoldier );
BOOLEAN TransferFundsFromMercToBank( SOLDIERTYPE *pSoldier, INT32 iCurrentBalance );
BOOLEAN TransferFundsFromBankToMerc( SOLDIERTYPE *pSoldier, INT32 iCurrentBalance );
BOOLEAN RemoveNewlyHiredMercFromPersonnelDepartedList( UINT8 ubProfile ); BOOLEAN RemoveNewlyHiredMercFromPersonnelDepartedList( UINT8 ubProfile );
void AssignPersonnelSkillTraitHelpText( UINT8 ubTraitNumber, BOOLEAN fExpertLevel, BOOLEAN fRegMale, STR16 apStr ); void AssignPersonnelSkillTraitHelpText( UINT8 ubTraitNumber, BOOLEAN fExpertLevel, BOOLEAN fRegMale, STR16 apStr );