Revisión | fa8ac1e427b8c79254638e9bb6d23a7337aaa8e0 (tree) |
---|---|
Tiempo | 2022-10-06 10:36:16 |
Autor | Adam Kaminski <kaminskiadam9@gmai...> |
Commiter | Adam Kaminski |
Did some cleanup in settings_GameplayTab_ShowOrHideItems.
@@ -661,19 +661,18 @@ | ||
661 | 661 | |
662 | 662 | void settings_GameplayTab_ShowOrHideItems( HWND hDlg ) |
663 | 663 | { |
664 | - GAMEMODE_e GameMode; | |
665 | - LONG lInput; | |
664 | + // Get the selected game mode. | |
665 | + LONG lInput = SendDlgItemMessage( hDlg, IDC_GAMEPLAYMODE, CB_GETCURSEL, 0, 0 ); | |
666 | 666 | |
667 | - // Get the selected game mode. | |
668 | - lInput = SendDlgItemMessage( hDlg, IDC_GAMEPLAYMODE, CB_GETCURSEL, 0, 0 ); | |
669 | 667 | if ( lInput >= 0 && lInput < NUM_GAMEMODES ) |
670 | 668 | { |
671 | - GameMode = (GAMEMODE_e) lInput; | |
669 | + const GAMEMODE_e GameMode = static_cast<GAMEMODE_e>( lInput ); | |
670 | + const ULONG ulGameModeFlags = GAMEMODE_GetFlags( GameMode ); | |
672 | 671 | |
673 | 672 | // 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 ); | |
677 | 676 | |
678 | 677 | // Show the duellimit if Duel is selected. |
679 | 678 | ShowWindow( GetDlgItem( hDlg, IDC_DUELLIMIT ), ( GameMode == GAMEMODE_DUEL ) ? SW_SHOW : SW_HIDE ); |
@@ -681,14 +680,14 @@ | ||
681 | 680 | ShowWindow( GetDlgItem( hDlg, IDC_DUELLIMIT_LABEL ), (GameMode == GAMEMODE_DUEL ) ? SW_SHOW : SW_HIDE ); |
682 | 681 | |
683 | 682 | // 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 ); | |
687 | 686 | |
688 | 687 | // 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 ); | |
692 | 691 | } |
693 | 692 | } |
694 | 693 |