Skip to content

Remove several unused functions #530

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
majcosta merged 4 commits into from
Oct 7, 2025
Merged

Remove several unused functions #530

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2051c92
remove unused ATMStartButtonCallback
majcosta Oct 6, 2025
d6ea4e1
Remove unused CreateDestroyATMButton
majcosta Oct 6, 2025
00b3784
remove unused ATMOtherButtonCallback
majcosta Oct 7, 2025
94d7483
Remove unused ATMOther2ButtonCallback
majcosta Oct 7, 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
289 changes: 0 additions & 289 deletions Laptop/personnel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,16 +421,12 @@ void DisplayATMAmount( void );

// create destroy ATM button
void CreateDestroyStartATMButton( void );
void CreateDestroyATMButton( void );
void ATMStartButtonCallback(GUI_BUTTON *btn,INT32 reason);
void ATMNumberButtonCallback(GUI_BUTTON *btn,INT32 reason);
void HandleStateOfATMButtons( void );
void ATMOtherButtonCallback(GUI_BUTTON *btn,INT32 reason);


// atm misc functions

void ATMOther2ButtonCallback(GUI_BUTTON *btn,INT32 reason);
void DisplayATMStrings( void );
void DisplayAmountOnCurrentMerc( void );
void RenderRectangleForPersonnelTransactionAmount( void );
Expand Down Expand Up @@ -636,7 +632,6 @@ void ExitPersonnel( void )
fShowAtmPanel = FALSE;
fATMFlags = 0;
CreateDestroyStartATMButton( );
CreateDestroyATMButton( );

gubPersonnelInfoState = PERSONNEL_STAT_BTN;

Expand Down Expand Up @@ -5750,7 +5745,6 @@ BOOLEAN RenderAtmPanel( void )

// create destroy
CreateDestroyStartATMButton( );
CreateDestroyATMButton( );

// display strings for ATM
DisplayATMStrings( );
Expand Down Expand Up @@ -5786,7 +5780,6 @@ BOOLEAN RenderAtmPanel( void )

// create destroy
CreateDestroyStartATMButton( );
CreateDestroyATMButton( );
}
return( TRUE );
}
Expand Down Expand Up @@ -5943,140 +5936,6 @@ void RenderSliderBarForPersonnelInventory( void )
BltVideoObject( FRAME_BUFFER, hHandle, 5,( INT16 ) ( X_OF_PERSONNEL_SCROLL_REGION ), ( INT16 ) ( guiSliderPosition + Y_OF_PERSONNEL_SCROLL_REGION), VO_BLT_SRCTRANSPARENCY,NULL);
}

void CreateDestroyATMButton( void )
{
/*
static BOOLEAN fCreated = FALSE;
CHAR16 sString[ 32 ];



// create/destroy atm start button as needed
INT32 iCounter = 0;

if( ( fCreated == FALSE ) && ( fShowAtmPanel == TRUE ) )
{

for( iCounter = 0; iCounter < 10; iCounter++ )
{
if( iCounter != 9 )
{
iNumberPadButtonsImages[ iCounter ]=LoadButtonImage( "LAPTOP\\AtmButtons.sti" ,-1,4,-1,6,-1 );
swprintf( sString, L"%d", iCounter+1 );
}
else
{
iNumberPadButtonsImages[ iCounter ]=LoadButtonImage( "LAPTOP\\AtmButtons.sti" ,-1,7,-1,9,-1 );
swprintf( sString, L"%d", iCounter - 9 );
}

iNumberPadButtons[ iCounter ] = QuickCreateButton( iNumberPadButtonsImages[ iCounter ], ( INT16 )( ATM_BUTTONS_START_X + ( ATM_BUTTON_WIDTH * ( INT16 )( iCounter % 3 )) ), ( INT16 )( ATM_BUTTONS_START_Y + ( INT16 )( ATM_BUTTON_HEIGHT * ( iCounter / 3 ))) ,
BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST - 1,
BtnGenericMouseMoveButtonCallback, (GUI_CALLBACK)ATMNumberButtonCallback );

if( iCounter != 9)
{
MSYS_SetBtnUserData(iNumberPadButtons[iCounter],0,iCounter + 1 );
}
else
{
MSYS_SetBtnUserData(iNumberPadButtons[iCounter],0, 0 );
}
SetButtonCursor(iNumberPadButtons[iCounter], CURSOR_LAPTOP_SCREEN);
SpecifyButtonFont( iNumberPadButtons[iCounter], PERS_FONT );
SpecifyButtonText( iNumberPadButtons[iCounter], sString );
SpecifyButtonUpTextColors( iNumberPadButtons[iCounter], FONT_BLACK, FONT_BLACK );

}


// now slap down done, cancel, dep, withdraw
for( iCounter = OK_ATM; iCounter < NUMBER_ATM_BUTTONS ;iCounter++ )
{
if( iCounter == OK_ATM )
{
giPersonnelATMSideButtonImage[ iCounter ]= LoadButtonImage( "LAPTOP\\AtmButtons.sti" ,-1,7,-1,9,-1 );
}
else
{
giPersonnelATMSideButtonImage[ iCounter ]= LoadButtonImage( "LAPTOP\\AtmButtons.sti" ,-1,10,-1,12,-1 );
}

if( ( iCounter != DEPOSIT_ATM ) && ( iCounter != WIDTHDRAWL_ATM ) )
{
giPersonnelATMSideButton[ iCounter ] = QuickCreateButton( giPersonnelATMSideButtonImage[ iCounter ], ( INT16 )( pAtmSideButtonPts[ iCounter ].x ), ( INT16 )( pAtmSideButtonPts[ iCounter ].y ),
BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST - 1,
BtnGenericMouseMoveButtonCallback, (GUI_CALLBACK)ATMOtherButtonCallback );
}
else
{
giPersonnelATMSideButton[ iCounter ] = QuickCreateButton( giPersonnelATMSideButtonImage[ iCounter ], ( INT16 )( pAtmSideButtonPts[ iCounter ].x ), ( INT16 )( pAtmSideButtonPts[ iCounter ].y ),
BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST - 1,
BtnGenericMouseMoveButtonCallback, (GUI_CALLBACK)ATMOther2ButtonCallback );
}
MSYS_SetBtnUserData(giPersonnelATMSideButton[iCounter],0,iCounter );
SpecifyButtonFont( giPersonnelATMSideButton[iCounter], PERS_FONT );
SetButtonCursor(giPersonnelATMSideButton[iCounter], CURSOR_LAPTOP_SCREEN);
SpecifyButtonUpTextColors( giPersonnelATMSideButton[iCounter], FONT_BLACK, FONT_BLACK );
SpecifyButtonText( giPersonnelATMSideButton[iCounter], gsAtmSideButtonText[ iCounter ] );
}


//SetButtonCursor(giPersonnelATMStartButton, CURSOR_LAPTOP_SCREEN);
fCreated = TRUE;
}
else if( ( fCreated == TRUE ) && ( fShowAtmPanel == FALSE ) )
{
// stop showing
//RemoveButton( giPersonnelATMButton );
//UnloadButtonImage( giPersonnelATMButtonImage );

for( iCounter = 0; iCounter < 10; iCounter++ )
{
UnloadButtonImage( iNumberPadButtonsImages[ iCounter ] );
RemoveButton( iNumberPadButtons[ iCounter ] );
}

for( iCounter = OK_ATM; iCounter < NUMBER_ATM_BUTTONS ;iCounter++ )
{
RemoveButton( giPersonnelATMSideButton[ iCounter ] );
UnloadButtonImage( giPersonnelATMSideButtonImage[ iCounter ] );
}

fCreated = FALSE;
}

*/
}


void ATMStartButtonCallback(GUI_BUTTON *btn,INT32 reason)
{
if (!(btn->uiFlags & BUTTON_ENABLED))
return;

if(reason & MSYS_CALLBACK_REASON_LBUTTON_DWN )
{
if(!(btn->uiFlags & BUTTON_CLICKED_ON))
{
fReDrawScreenFlag=TRUE;
}
btn->uiFlags|=(BUTTON_CLICKED_ON);
}
else if(reason & MSYS_CALLBACK_REASON_LBUTTON_UP )
{
if(btn->uiFlags & BUTTON_CLICKED_ON)
{
btn->uiFlags&=~(BUTTON_CLICKED_ON);
fReDrawScreenFlag=TRUE;
fShowAtmPanel = TRUE;
fShowAtmPanelStartButton = FALSE;
fATMFlags = 0;

}
}
}

void PersonnelDataButtonCallback( GUI_BUTTON *btn, INT32 reason )
{
if (!(btn->uiFlags & BUTTON_ENABLED))
Expand All @@ -6100,154 +5959,6 @@ void PersonnelDataButtonCallback( GUI_BUTTON *btn, INT32 reason )
}
}

void ATMOther2ButtonCallback(GUI_BUTTON *btn,INT32 reason)
{
INT32 iValue = 0;

if (!(btn->uiFlags & BUTTON_ENABLED))
return;

iValue = MSYS_GetBtnUserData( btn, 0 );

if(reason & MSYS_CALLBACK_REASON_LBUTTON_DWN )
{
if(!(btn->uiFlags & BUTTON_CLICKED_ON))
{
fReDrawScreenFlag=TRUE;
}
btn->uiFlags|=(BUTTON_CLICKED_ON);

switch( iValue )
{
case( DEPOSIT_ATM ):
fATMFlags = 2;
fReDrawScreenFlag=TRUE;
ButtonList[ giPersonnelATMSideButton[ WIDTHDRAWL_ATM ] ]->uiFlags&=~(BUTTON_CLICKED_ON);
break;
case( WIDTHDRAWL_ATM ):
fATMFlags = 3;
fReDrawScreenFlag=TRUE;
ButtonList[ giPersonnelATMSideButton[ DEPOSIT_ATM ] ]->uiFlags&=~(BUTTON_CLICKED_ON);
break;
}
}
}

void ATMOtherButtonCallback(GUI_BUTTON *btn,INT32 reason)
{
INT32 iValue = 0;
SOLDIERTYPE *pSoldier = MercPtrs[ 0 ];

if (!(btn->uiFlags & BUTTON_ENABLED))
return;

iValue = MSYS_GetBtnUserData( btn, 0 );

if(reason & MSYS_CALLBACK_REASON_LBUTTON_DWN )
{
if(!(btn->uiFlags & BUTTON_CLICKED_ON))
{
fReDrawScreenFlag=TRUE;
}
btn->uiFlags|=(BUTTON_CLICKED_ON);
}
else if(reason & MSYS_CALLBACK_REASON_LBUTTON_UP )
{
if(btn->uiFlags & BUTTON_CLICKED_ON)
{
btn->uiFlags&=~(BUTTON_CLICKED_ON);

if (fCurrentTeamMode &&
currentTeamIndex != -1) {
// set soldier
pSoldier = currentTeamList[currentTeamIndex];

switch( iValue ) {
case( OK_ATM ):
if( fATMFlags == 0 ) {
fATMFlags = 1;
fReDrawScreenFlag=TRUE;
fOneFrameDelayInPersonnel = TRUE;
} else if( fATMFlags == 2 ) {
// deposit from merc to account
if( GetFundsOnMerc( pSoldier ) >= wcstol( sTransferString, NULL, 10 ) ) {
if( ( wcstol( sTransferString, NULL, 10 ) % 10 ) != 0 ) {
fOldATMFlags = fATMFlags;
fATMFlags = 5;
iValue = ( wcstol( sTransferString, NULL, 10 ) - ( wcstol( sTransferString, NULL, 10 ) % 10 ) );
swprintf( sTransferString, L"%d", iValue );
fReDrawScreenFlag=TRUE;
} else {
// transfer
TransferFundsFromMercToBank( pSoldier, wcstol( sTransferString, NULL, 10 ) );
sTransferString[ 0 ] = 0;
fReDrawScreenFlag=TRUE;
}
} else {
fOldATMFlags = fATMFlags;
fATMFlags = 4;
iValue = GetFundsOnMerc( pSoldier );
swprintf( sTransferString, L"%d", iValue );
fReDrawScreenFlag=TRUE;
}
} else if( fATMFlags == 3 ) {
// deposit from merc to account
if( LaptopSaveInfo.iCurrentBalance >= wcstol( sTransferString, NULL, 10 ) ) {
if( ( wcstol( sTransferString, NULL, 10 ) % 10 ) != 0 ) {
fOldATMFlags = fATMFlags;
fATMFlags = 5;
iValue = ( wcstol( sTransferString, NULL, 10 ) - ( wcstol( sTransferString, NULL, 10 ) % 10 ) );
swprintf( sTransferString, L"%d", iValue );
fReDrawScreenFlag=TRUE;
} else {
// transfer
TransferFundsFromBankToMerc( pSoldier, wcstol( sTransferString, NULL, 10 ) );
sTransferString[ 0 ] = 0;
fReDrawScreenFlag=TRUE;
}
} else {
fOldATMFlags = fATMFlags;
fATMFlags = 4;
iValue = LaptopSaveInfo.iCurrentBalance;
swprintf( sTransferString, L"%d", iValue );
fReDrawScreenFlag=TRUE;
}
} else if( fATMFlags == 4 ) {
fATMFlags = fOldATMFlags;
fReDrawScreenFlag=TRUE;
}
break;
case( DEPOSIT_ATM ):
fATMFlags = 2;
fReDrawScreenFlag=TRUE;
break;
case( WIDTHDRAWL_ATM ):
fATMFlags = 3;
fReDrawScreenFlag=TRUE;
break;
case( CANCEL_ATM ):
if( sTransferString[ 0 ] != 0 ) {
sTransferString[ 0 ] = 0;
} else if( fATMFlags != 0 ) {
fATMFlags = 0;
ButtonList[ giPersonnelATMSideButton[ WIDTHDRAWL_ATM ] ]->uiFlags&=~(BUTTON_CLICKED_ON);
ButtonList[ giPersonnelATMSideButton[ DEPOSIT_ATM ] ]->uiFlags&=~(BUTTON_CLICKED_ON);
} else {
fShowAtmPanel = FALSE;
fShowAtmPanelStartButton = TRUE;
}
fReDrawScreenFlag=TRUE;
break;
case( CLEAR_ATM ):
sTransferString[ 0 ] = 0;
fReDrawScreenFlag=TRUE;
break;
} // switch
}
}
}
}

void ATMNumberButtonCallback(GUI_BUTTON *btn,INT32 reason)
{

Expand Down