• R/O
  • SSH

zandronum-sandbox-stable: Commit


Commit MetaInfo

Revisiónfa8ac1e427b8c79254638e9bb6d23a7337aaa8e0 (tree)
Tiempo2022-10-06 10:36:16
AutorAdam Kaminski <kaminskiadam9@gmai...>
CommiterAdam Kaminski

Log Message

Did some cleanup in settings_GameplayTab_ShowOrHideItems.

Cambiar Resumen

Diferencia incremental

diff -r 80a38f946ad1 -r fa8ac1e427b8 src/win32/serverconsole/serverconsole_settings.cpp
--- a/src/win32/serverconsole/serverconsole_settings.cpp Mon Oct 03 09:44:10 2022 -0400
+++ b/src/win32/serverconsole/serverconsole_settings.cpp Wed Oct 05 21:36:16 2022 -0400
@@ -661,19 +661,18 @@
661661
662662 void settings_GameplayTab_ShowOrHideItems( HWND hDlg )
663663 {
664- GAMEMODE_e GameMode;
665- LONG lInput;
664+ // Get the selected game mode.
665+ LONG lInput = SendDlgItemMessage( hDlg, IDC_GAMEPLAYMODE, CB_GETCURSEL, 0, 0 );
666666
667- // Get the selected game mode.
668- lInput = SendDlgItemMessage( hDlg, IDC_GAMEPLAYMODE, CB_GETCURSEL, 0, 0 );
669667 if ( lInput >= 0 && lInput < NUM_GAMEMODES )
670668 {
671- GameMode = (GAMEMODE_e) lInput;
669+ const GAMEMODE_e GameMode = static_cast<GAMEMODE_e>( lInput );
670+ const ULONG ulGameModeFlags = GAMEMODE_GetFlags( GameMode );
672671
673672 // Show lives if this mode uses them.
674- ShowWindow( GetDlgItem( hDlg, IDC_MAXLIVES ), ( GAMEMODE_GetFlags( GameMode ) & GMF_USEMAXLIVES ) ? SW_SHOW : SW_HIDE );
675- ShowWindow( GetDlgItem( hDlg, IDC_MAXLIVESSPIN ), ( GAMEMODE_GetFlags( GameMode ) & GMF_USEMAXLIVES ) ? SW_SHOW : SW_HIDE );
676- ShowWindow( GetDlgItem( hDlg, IDC_MAXLIVES_LABEL ), ( GAMEMODE_GetFlags( GameMode ) & GMF_USEMAXLIVES ) ? SW_SHOW : SW_HIDE );
673+ ShowWindow( GetDlgItem( hDlg, IDC_MAXLIVES ), ( ulGameModeFlags & GMF_USEMAXLIVES ) ? SW_SHOW : SW_HIDE );
674+ ShowWindow( GetDlgItem( hDlg, IDC_MAXLIVESSPIN ), ( ulGameModeFlags & GMF_USEMAXLIVES ) ? SW_SHOW : SW_HIDE );
675+ ShowWindow( GetDlgItem( hDlg, IDC_MAXLIVES_LABEL ), ( ulGameModeFlags & GMF_USEMAXLIVES ) ? SW_SHOW : SW_HIDE );
677676
678677 // Show the duellimit if Duel is selected.
679678 ShowWindow( GetDlgItem( hDlg, IDC_DUELLIMIT ), ( GameMode == GAMEMODE_DUEL ) ? SW_SHOW : SW_HIDE );
@@ -681,14 +680,14 @@
681680 ShowWindow( GetDlgItem( hDlg, IDC_DUELLIMIT_LABEL ), (GameMode == GAMEMODE_DUEL ) ? SW_SHOW : SW_HIDE );
682681
683682 // Show pointlimit if players earn points.
684- ShowWindow( GetDlgItem( hDlg, IDC_POINTLIMIT ), ( GAMEMODE_GetFlags( GameMode ) & GMF_PLAYERSEARNPOINTS ) ? SW_SHOW : SW_HIDE );
685- ShowWindow( GetDlgItem( hDlg, IDC_POINTLIMITSPIN ), ( GAMEMODE_GetFlags( GameMode ) & GMF_PLAYERSEARNPOINTS ) ? SW_SHOW : SW_HIDE );
686- ShowWindow( GetDlgItem( hDlg, IDC_POINTLIMIT_LABEL ), ( GAMEMODE_GetFlags( GameMode ) & GMF_PLAYERSEARNPOINTS ) ? SW_SHOW : SW_HIDE );
683+ ShowWindow( GetDlgItem( hDlg, IDC_POINTLIMIT ), ( ulGameModeFlags & GMF_PLAYERSEARNPOINTS ) ? SW_SHOW : SW_HIDE );
684+ ShowWindow( GetDlgItem( hDlg, IDC_POINTLIMITSPIN ), ( ulGameModeFlags & GMF_PLAYERSEARNPOINTS ) ? SW_SHOW : SW_HIDE );
685+ ShowWindow( GetDlgItem( hDlg, IDC_POINTLIMIT_LABEL ), ( ulGameModeFlags & GMF_PLAYERSEARNPOINTS ) ? SW_SHOW : SW_HIDE );
687686
688687 // Show winlimit if players earn wins.
689- ShowWindow( GetDlgItem( hDlg, IDC_WINLIMIT ), ( GAMEMODE_GetFlags( GameMode ) & GMF_PLAYERSEARNWINS || GameMode == GAMEMODE_DUEL ) ? SW_SHOW : SW_HIDE );
690- ShowWindow( GetDlgItem( hDlg, IDC_WINLIMITSPIN ), ( GAMEMODE_GetFlags( GameMode ) & GMF_PLAYERSEARNWINS || GameMode == GAMEMODE_DUEL ) ? SW_SHOW : SW_HIDE );
691- ShowWindow( GetDlgItem( hDlg, IDC_WINLIMIT_LABEL ), ( GAMEMODE_GetFlags( GameMode ) & GMF_PLAYERSEARNWINS || GameMode == GAMEMODE_DUEL ) ? SW_SHOW : SW_HIDE );
688+ ShowWindow( GetDlgItem( hDlg, IDC_WINLIMIT ), ( ulGameModeFlags & GMF_PLAYERSEARNWINS || GameMode == GAMEMODE_DUEL ) ? SW_SHOW : SW_HIDE );
689+ ShowWindow( GetDlgItem( hDlg, IDC_WINLIMITSPIN ), ( ulGameModeFlags & GMF_PLAYERSEARNWINS || GameMode == GAMEMODE_DUEL ) ? SW_SHOW : SW_HIDE );
690+ ShowWindow( GetDlgItem( hDlg, IDC_WINLIMIT_LABEL ), ( ulGameModeFlags & GMF_PLAYERSEARNWINS || GameMode == GAMEMODE_DUEL ) ? SW_SHOW : SW_HIDE );
692691 }
693692 }
694693
Show on old repository browser