From a9165713cb7387dd927229127e6e1fcc6cb92afb Mon Sep 17 00:00:00 2001 From: Barry Harris <44396066+barry65536@users.noreply.github.com> Date: Fri, 6 Mar 2015 09:24:13 +0000 Subject: [PATCH] Remove SNES filter and put GG back into own (untested - please test!) --- src/burn/burn.h | 6 +++--- src/burn/drv/snes/d_snes.cpp | 8 ++++---- src/burner/win32/sel.cpp | 16 ++++++++-------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/burn/burn.h b/src/burn/burn.h index 7a1a0c36e..11c261015 100644 --- a/src/burn/burn.h +++ b/src/burn/burn.h @@ -352,7 +352,7 @@ void IpsApplyPatches(UINT8* base, char* rom_name); #define HARDWARE_PREFIX_PACMAN (0x0f000000) #define HARDWARE_PREFIX_GALAXIAN (0x10000000) #define HARDWARE_PREFIX_IREM (0x11000000) -#define HARDWARE_PREFIX_NINTENDO_SNES (0x12000000) +//#define HARDWARE_PREFIX_NINTENDO_SNES (0x12000000) #define HARDWARE_PREFIX_DATAEAST (0x13000000) #define HARDWARE_PREFIX_CAPCOM_MISC (0x14000000) #define HARDWARE_PREFIX_SETA (0x15000000) @@ -362,7 +362,7 @@ void IpsApplyPatches(UINT8* base, char* rom_name); #define HARDWARE_PREFIX_SEGA_SG1000 (0x19000000) #define HARDWARE_PREFIX_COLECO (0x1A000000) #define HARDWARE_PREFIX_MIDWAY (0x1B000000) -#define HARDWARE_PREFIX_SEGA_GAME_GEAR (HARDWARE_PREFIX_SEGA_MASTER_SYSTEM | 0x00010000) +#define HARDWARE_PREFIX_SEGA_GAME_GEAR (0x12000000) #define HARDWARE_MISC_PRE90S (HARDWARE_PREFIX_MISC_PRE90S) #define HARDWARE_MISC_POST90S (HARDWARE_PREFIX_MISC_POST90S) @@ -528,7 +528,7 @@ void IpsApplyPatches(UINT8* base, char* rom_name); #define HARDWARE_GALAXIAN (HARDWARE_PREFIX_GALAXIAN) -#define HARDWARE_NINTENDO_SNES (HARDWARE_PREFIX_NINTENDO_SNES) +//#define HARDWARE_NINTENDO_SNES (HARDWARE_PREFIX_NINTENDO_SNES) #define HARWARE_CAPCOM_MISC (HARDWARE_PREFIX_CAPCOM_MISC) diff --git a/src/burn/drv/snes/d_snes.cpp b/src/burn/drv/snes/d_snes.cpp index 2f3f025f8..ed4e373b9 100644 --- a/src/burn/drv/snes/d_snes.cpp +++ b/src/burn/drv/snes/d_snes.cpp @@ -42,7 +42,7 @@ struct BurnDriverD BurnDrvrSMW = { "smw", NULL, NULL, NULL, "1986", "Super Mario World (Europe) (Rev 1)\0", NULL, "Nintendo", "Miscellaneous", L"Super Mario World (Europe) (Rev 1)", NULL, NULL, NULL, - BDF_GAME_WORKING|BDF_16BIT_ONLY , 2, HARDWARE_NINTENDO_SNES, GBF_SHOOT,0 , + BDF_GAME_WORKING|BDF_16BIT_ONLY , 2, HARDWARE_PREFIX_MISC_POST90S, GBF_SHOOT,0 , NULL, rSuperMarioWorldEuropeRev1RomInfo, rSuperMarioWorldEuropeRev1RomName,NULL,NULL, SnesInputInfo, SnesDIPInfo, SnesInit, SnesExit, SnesFrame, NULL, SnesScan, NULL,0x6000,512 , 244, 4, 3 @@ -60,7 +60,7 @@ struct BurnDriverD BurnDrvrSuperMarioWorldEurope = { "smwa", NULL, NULL, NULL, "1986", "Super Mario World (Europe)\0", NULL, "Nintendo", "Miscellaneous", L"Super Mario World (Europe)", NULL, NULL, NULL, - BDF_GAME_WORKING|BDF_16BIT_ONLY , 2, HARDWARE_NINTENDO_SNES, GBF_SHOOT,0 , + BDF_GAME_WORKING|BDF_16BIT_ONLY , 2, HARDWARE_PREFIX_MISC_POST90S, GBF_SHOOT,0 , NULL, rSuperMarioWorldEuropeRomInfo, rSuperMarioWorldEuropeRomName,NULL,NULL, SnesInputInfo, SnesDIPInfo, SnesInit, SnesExit, SnesFrame, NULL, SnesScan, NULL,0x6000,512 , 244, 4, 3 @@ -78,7 +78,7 @@ struct BurnDriverD BurnDrvrSuperMarioWorldJapan = { "smwj", NULL, NULL, NULL, "1986", "Super Mario World (Japan)\0", NULL, "Nintendo", "Miscellaneous", L"Super Mario World (Japan)", NULL, NULL, NULL, - BDF_GAME_WORKING|BDF_16BIT_ONLY , 2, HARDWARE_NINTENDO_SNES, GBF_SHOOT,0 , + BDF_GAME_WORKING|BDF_16BIT_ONLY , 2, HARDWARE_PREFIX_MISC_POST90S, GBF_SHOOT,0 , NULL, rSuperMarioWorldJapanRomInfo, rSuperMarioWorldJapanRomName,NULL,NULL, SnesInputInfo, SnesDIPInfo, SnesInit, SnesExit, SnesFrame, NULL, SnesScan, NULL,0x6000,512 , 244, 4, 3 @@ -96,7 +96,7 @@ struct BurnDriverD BurnDrvrSuperMarioWorldUSA = { "smwu", NULL, NULL, NULL, "1986", "Super Mario World (USA)\0", NULL, "Nintendo", "Miscellaneous", L"Super Mario World (USA)", NULL, NULL, NULL, - BDF_GAME_WORKING|BDF_16BIT_ONLY , 2, HARDWARE_NINTENDO_SNES, GBF_SHOOT,0 , + BDF_GAME_WORKING|BDF_16BIT_ONLY , 2, HARDWARE_PREFIX_MISC_POST90S, GBF_SHOOT,0 , NULL, rSuperMarioWorldUSARomInfo, rSuperMarioWorldUSARomName,NULL,NULL, SnesInputInfo, SnesDIPInfo, SnesInit, SnesExit, SnesFrame, NULL, SnesScan, NULL,0x6000,512 , 244, 4, 3 diff --git a/src/burner/win32/sel.cpp b/src/burner/win32/sel.cpp index 9139e528c..e8ef12183 100644 --- a/src/burner/win32/sel.cpp +++ b/src/burner/win32/sel.cpp @@ -112,7 +112,7 @@ HTREEITEM hFilterMiscPre90s = NULL; HTREEITEM hFilterMiscPost90s = NULL; HTREEITEM hFilterMegadrive = NULL; HTREEITEM hFilterPce = NULL; -HTREEITEM hFilterSnes = NULL; +//HTREEITEM hFilterSnes = NULL; HTREEITEM hFilterSms = NULL; HTREEITEM hFilterGg = NULL; HTREEITEM hFilterSg1000 = NULL; @@ -224,8 +224,8 @@ static int MegadriveValue = HARDWARE_PREFIX_SEGA_MEGADRIVE >> 24; static int MASKMEGADRIVE = 1 << MegadriveValue; static int PCEngineValue = HARDWARE_PREFIX_PCENGINE >> 24; static int MASKPCENGINE = 1 << PCEngineValue; -static int SnesValue = HARDWARE_PREFIX_NINTENDO_SNES >> 24; -static int MASKSNES = 1 << SnesValue; +//static int SnesValue = HARDWARE_PREFIX_NINTENDO_SNES >> 24; +//static int MASKSNES = 1 << SnesValue; static int SmsValue = HARDWARE_PREFIX_SEGA_MASTER_SYSTEM >> 24; static int MASKSMS = 1 << SmsValue; static int GgValue = HARDWARE_PREFIX_SEGA_GAME_GEAR >> 24; @@ -235,7 +235,7 @@ static int MASKSG1000 = 1 << Sg1000Value; static int ColecoValue = HARDWARE_PREFIX_COLECO >> 24; static int MASKCOLECO = 1 << ColecoValue; -static int MASKALL = MASKCAPMISC | MASKCAVE | MASKCPS | MASKCPS2 | MASKCPS3 | MASKDATAEAST | MASKGALAXIAN | MASKIREM | MASKKANEKO | MASKKONAMI | MASKNEOGEO | MASKPACMAN | MASKPGM | MASKPSIKYO | MASKSEGA | MASKSETA | MASKTAITO | MASKTECHNOS | MASKTOAPLAN | MASKMISCPRE90S | MASKMISCPOST90S | MASKMEGADRIVE | MASKPCENGINE | MASKSNES | MASKSMS | MASKGG | MASKSG1000 | MASKCOLECO; +static int MASKALL = MASKCAPMISC | MASKCAVE | MASKCPS | MASKCPS2 | MASKCPS3 | MASKDATAEAST | MASKGALAXIAN | MASKIREM | MASKKANEKO | MASKKONAMI | MASKNEOGEO | MASKPACMAN | MASKPGM | MASKPSIKYO | MASKSEGA | MASKSETA | MASKTAITO | MASKTECHNOS | MASKTOAPLAN | MASKMISCPRE90S | MASKMISCPOST90S | MASKMEGADRIVE | MASKPCENGINE | MASKSMS | MASKGG | MASKSG1000 | MASKCOLECO; // | MASKSNES #define UNAVAILABLE (1 << 27) #define AVAILABLE (1 << 28) @@ -1126,7 +1126,7 @@ static void CreateFilters() _TVCreateFiltersA(hHardware , IDS_SEL_GG , hFilterGg , nLoadMenuShowX & MASKGG ); _TVCreateFiltersA(hHardware , IDS_SEL_MEGADRIVE , hFilterMegadrive , nLoadMenuShowX & MASKMEGADRIVE ); _TVCreateFiltersA(hHardware , IDS_SEL_PCE , hFilterPce , nLoadMenuShowX & MASKPCENGINE ); - _TVCreateFiltersA(hHardware , IDS_SEL_SNES , hFilterSnes , nLoadMenuShowX & MASKSNES ); +// _TVCreateFiltersA(hHardware , IDS_SEL_SNES , hFilterSnes , nLoadMenuShowX & MASKSNES ); _TVCreateFiltersA(hHardware , IDS_SEL_SG1000 , hFilterSg1000 , nLoadMenuShowX & MASKSG1000 ); _TVCreateFiltersA(hHardware , IDS_SEL_COLECO , hFilterColeco , nLoadMenuShowX & MASKCOLECO ); @@ -1331,7 +1331,7 @@ static INT_PTR CALLBACK DialogProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lP _TreeView_SetCheckState(hFilterList, hFilterMiscPost90s, FALSE); _TreeView_SetCheckState(hFilterList, hFilterMegadrive, FALSE); _TreeView_SetCheckState(hFilterList, hFilterPce, FALSE); - _TreeView_SetCheckState(hFilterList, hFilterSnes, FALSE); +// _TreeView_SetCheckState(hFilterList, hFilterSnes, FALSE); _TreeView_SetCheckState(hFilterList, hFilterSms, FALSE); _TreeView_SetCheckState(hFilterList, hFilterGg, FALSE); _TreeView_SetCheckState(hFilterList, hFilterSg1000, FALSE); @@ -1364,7 +1364,7 @@ static INT_PTR CALLBACK DialogProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lP _TreeView_SetCheckState(hFilterList, hFilterMiscPost90s, TRUE); _TreeView_SetCheckState(hFilterList, hFilterMegadrive, TRUE); _TreeView_SetCheckState(hFilterList, hFilterPce, TRUE); - _TreeView_SetCheckState(hFilterList, hFilterSnes, TRUE); +// _TreeView_SetCheckState(hFilterList, hFilterSnes, TRUE); _TreeView_SetCheckState(hFilterList, hFilterSms, TRUE); _TreeView_SetCheckState(hFilterList, hFilterGg, TRUE); _TreeView_SetCheckState(hFilterList, hFilterSg1000, TRUE); @@ -1511,7 +1511,7 @@ static INT_PTR CALLBACK DialogProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lP if (hItemChanged == hFilterMiscPost90s) _ToggleGameListing(nLoadMenuShowX, MASKMISCPOST90S); if (hItemChanged == hFilterMegadrive) _ToggleGameListing(nLoadMenuShowX, MASKMEGADRIVE); if (hItemChanged == hFilterPce) _ToggleGameListing(nLoadMenuShowX, MASKPCENGINE); - if (hItemChanged == hFilterSnes) _ToggleGameListing(nLoadMenuShowX, MASKSNES); +// if (hItemChanged == hFilterSnes) _ToggleGameListing(nLoadMenuShowX, MASKSNES); if (hItemChanged == hFilterSms) _ToggleGameListing(nLoadMenuShowX, MASKSMS); if (hItemChanged == hFilterGg) _ToggleGameListing(nLoadMenuShowX, MASKGG); if (hItemChanged == hFilterSg1000) _ToggleGameListing(nLoadMenuShowX, MASKSG1000);