1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-16 14:47:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

rename fShowAtmPanelStartButton into something truthful

Browse Source 
there is no start button, this just controls whether to draw the four
buttons in the Personnel tab of the laptop or not

also get rid of lying comments

also make it static, laptop.cpp doesn't use it at all
This commit is contained in:
Marco Antonio J. Costa
2025-10-07 22:59:05 -03:00
committed by majcosta
parent 08b8d2f04f
commit d6166000c9
2 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/laptop.cpp
-6
View File
@@ -376,10 +376,6 @@ BOOLEAN fReDrawBookMarkInfo = FALSE;
// show the 2 second info about bookmarks being accessed by clicking on web // show the 2 second info about bookmarks being accessed by clicking on web
BOOLEAN fShowBookmarkInfo = FALSE; BOOLEAN fShowBookmarkInfo = FALSE;
// show start button for ATM panel?
extern BOOLEAN fShowAtmPanelStartButton;
//TEMP! Disables the loadpending delay when switching b/n www pages //TEMP! Disables the loadpending delay when switching b/n www pages
BOOLEAN gfTemporaryDisablingOfLoadPendingFlag=FALSE; BOOLEAN gfTemporaryDisablingOfLoadPendingFlag=FALSE;
@@ -1093,8 +1089,6 @@ INT32 EnterLaptop()
EnterLaptopInitLaptopPages(); EnterLaptopInitLaptopPages();
InitalizeSubSitesList( ); InitalizeSubSitesList( );
fShowAtmPanelStartButton = TRUE;
// lock cursor to screen // lock cursor to screen
if ( gGameExternalOptions.fLaptopMouseCaptured == TRUE ) if ( gGameExternalOptions.fLaptopMouseCaptured == TRUE )
{ {
Laptop/personnel.cpp
+7 -12
View File
@@ -257,8 +257,7 @@ INT32 giCurrentUpperLeftPortraitNumber = 0;
// which mode are we showing?..current team?...or deadly departed? // which mode are we showing?..current team?...or deadly departed?
BOOLEAN fCurrentTeamMode = TRUE; BOOLEAN fCurrentTeamMode = TRUE;
// show the atm panel? static bool showPersonnelButtons{ true };
BOOLEAN fShowAtmPanelStartButton = TRUE;
// create buttons for scrolling departures // create buttons for scrolling departures
BOOLEAN fCreatePeronnelDepartureButton = FALSE; BOOLEAN fCreatePeronnelDepartureButton = FALSE;
@@ -559,8 +558,7 @@ void EnterPersonnel( void )
// load graphics for screen // load graphics for screen
LoadPersonnelGraphics( ); LoadPersonnelGraphics( );
// show atm panel showPersonnelButtons = true;
fShowAtmPanelStartButton = TRUE;
// create buttons needed // create buttons needed
CreateDestroyButtonsForPersonnelDepartures( ); CreateDestroyButtonsForPersonnelDepartures( );
@@ -598,8 +596,7 @@ void ExitPersonnel( void )
fCurrentTeamMode = FALSE; fCurrentTeamMode = FALSE;
} }
// get rid of atm panel buttons showPersonnelButtons = false;
fShowAtmPanelStartButton = FALSE;
CreateDestroyStartATMButton( ); CreateDestroyStartATMButton( );
gubPersonnelInfoState = PERSONNEL_STAT_BTN; gubPersonnelInfoState = PERSONNEL_STAT_BTN;
@@ -5720,9 +5717,8 @@ BOOLEAN RenderAtmPanel( void )
void CreateDestroyStartATMButton( void ) void CreateDestroyStartATMButton( void )
{ {
static BOOLEAN fCreated = FALSE; static BOOLEAN fCreated = FALSE;
// create/destroy atm start button as needed
if( ( fCreated == FALSE ) && showPersonnelButtons )
if( ( fCreated == FALSE ) && ( fShowAtmPanelStartButton == TRUE ) )
{ {
// not created, must create // not created, must create
@@ -5761,7 +5757,7 @@ void CreateDestroyStartATMButton( void )
fCreated = TRUE; fCreated = TRUE;
} }
else if( ( fCreated == TRUE ) && ( fShowAtmPanelStartButton == FALSE ) ) else if( ( fCreated == TRUE ) && !showPersonnelButtons )
{ {
// stop showing // stop showing
for ( int i = 0; i < PERSONNEL_NUM_BTN; ++i ) for ( int i = 0; i < PERSONNEL_NUM_BTN; ++i )
@@ -6009,8 +6005,7 @@ BOOLEAN TransferFundsFromBankToMerc( SOLDIERTYPE *pSoldier, INT32 iCurrentBalanc
void UpDateStateOfStartButton( void ) void UpDateStateOfStartButton( void )
{ {
// start button being shown? if (!showPersonnelButtons)
if (!fShowAtmPanelStartButton)
return; return;
for ( int i = 0; i < PERSONNEL_NUM_BTN; ++i ) for ( int i = 0; i < PERSONNEL_NUM_BTN; ++i )