diff --git a/Laptop/personnel.cpp b/Laptop/personnel.cpp index 14c854a7..b4410346 100644 --- a/Laptop/personnel.cpp +++ b/Laptop/personnel.cpp @@ -5895,96 +5895,6 @@ INT32 GetFundsOnMerc( SOLDIERTYPE *pSoldier ) 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 ) { if (!showPersonnelButtons) diff --git a/Laptop/personnel.h b/Laptop/personnel.h index f6a62c1f..c9a4e5ac 100644 --- a/Laptop/personnel.h +++ b/Laptop/personnel.h @@ -74,9 +74,6 @@ void AddCharacterToFiredList( SOLDIERTYPE *pSoldier ); // get the total amt of money on this guy INT32 GetFundsOnMerc( SOLDIERTYPE *pSoldier ); -BOOLEAN TransferFundsFromMercToBank( SOLDIERTYPE *pSoldier, INT32 iCurrentBalance ); -BOOLEAN TransferFundsFromBankToMerc( SOLDIERTYPE *pSoldier, INT32 iCurrentBalance ); - BOOLEAN RemoveNewlyHiredMercFromPersonnelDepartedList( UINT8 ubProfile ); void AssignPersonnelSkillTraitHelpText( UINT8 ubTraitNumber, BOOLEAN fExpertLevel, BOOLEAN fRegMale, STR16 apStr );