From 0944a4d6f833a10d7b225fa52b21be20f1ee8f57 Mon Sep 17 00:00:00 2001 From: Barry Harris <44396066+barry65536@users.noreply.github.com> Date: Wed, 28 Dec 2011 21:38:45 +0000 Subject: [PATCH] Moved Kaneko16 and SNES to their own filters, DataEast to follow --- src/burn/burn.h | 5 ++- src/burn/drivers/misc_post90s/d_kaneko16.cpp | 34 ++++++++++---------- src/burn/drivers/snes/d_snes.cpp | 8 ++--- src/burner/platform/win32/resource_string.h | 2 ++ src/burner/platform/win32/sel.cpp | 16 ++++++++- src/burner/platform/win32/string.rc | 2 ++ 6 files changed, 44 insertions(+), 23 deletions(-) diff --git a/src/burn/burn.h b/src/burn/burn.h index eeb868e8a..6cad57153 100644 --- a/src/burn/burn.h +++ b/src/burn/burn.h @@ -311,10 +311,11 @@ void IpsApplyPatches(UINT8* base, char* rom_name); #define HARDWARE_PREFIX_TAITO (0x0c000000) #define HARDWARE_PREFIX_SEGA_MEGADRIVE (0x0d000000) #define HARDWARE_PREFIX_PSIKYO (0x0e000000) -//#define HARDWARE_PREFIX_KANEKO16 (0x0f000000) // spare +#define HARDWARE_PREFIX_KANEKO16 (0x0f000000) #define HARDWARE_PREFIX_PACMAN (0x10000000) #define HARDWARE_PREFIX_GALAXIAN (0x11000000) #define HARDWARE_PREFIX_IREM (0x12000000) +#define HARDWARE_PREFIX_NINTENDO_SNES (0x13000000) #define HARDWARE_MISC_PRE90S (HARDWARE_PREFIX_MISC_PRE90S) #define HARDWARE_MISC_POST90S (HARDWARE_PREFIX_MISC_POST90S) @@ -468,6 +469,8 @@ void IpsApplyPatches(UINT8* base, char* rom_name); #define HARDWARE_GALAXIAN (HARDWARE_PREFIX_GALAXIAN) +#define HARDWARE_NINTENDO_SNES (HARDWARE_PREFIX_NINTENDO_SNES) + // flags for the genre member #define GBF_HORSHOOT (1 << 0) #define GBF_VERSHOOT (1 << 1) diff --git a/src/burn/drivers/misc_post90s/d_kaneko16.cpp b/src/burn/drivers/misc_post90s/d_kaneko16.cpp index 9220c382e..9bdd8267a 100644 --- a/src/burn/drivers/misc_post90s/d_kaneko16.cpp +++ b/src/burn/drivers/misc_post90s/d_kaneko16.cpp @@ -4889,7 +4889,7 @@ struct BurnDriver BurnDrvBerlwall = { "berlwall", NULL, NULL, NULL, "1991", "The Berlin Wall\0", NULL, "Kaneko", "Kaneko 16-bit", NULL, NULL, NULL, NULL, - BDF_GAME_WORKING, 2, HARDWARE_MISC_POST90S, GBF_PLATFORM, 0, + BDF_GAME_WORKING, 2, HARDWARE_KANEKO16, GBF_PLATFORM, 0, NULL, BerlwallRomInfo, BerlwallRomName, NULL, NULL, BerlwallInputInfo, BerlwallDIPInfo, BerlwallInit, BerlwallExit, ExplbrkrFrame, NULL, ExplbrkrScan, &Kaneko16RecalcBg15Palette, 0x9000, 256, 224, 4, 3 @@ -4899,7 +4899,7 @@ struct BurnDriver BurnDrvBerlwallt = { "berlwallt", "berlwall", NULL, NULL, "1991", "The Berlin Wall (bootleg ?)\0", NULL, "Kaneko", "Kaneko 16-bit", NULL, NULL, NULL, NULL, - BDF_GAME_WORKING | BDF_CLONE | BDF_BOOTLEG, 2, HARDWARE_MISC_POST90S, GBF_PLATFORM, 0, + BDF_GAME_WORKING | BDF_CLONE | BDF_BOOTLEG, 2, HARDWARE_KANEKO16, GBF_PLATFORM, 0, NULL, BerlwalltRomInfo, BerlwalltRomName, NULL, NULL, BerlwallInputInfo, BerlwalltDIPInfo, BerlwallInit, BerlwallExit, ExplbrkrFrame, NULL, ExplbrkrScan, &Kaneko16RecalcBg15Palette, 0x9000, 256, 224, 4, 3 @@ -4909,7 +4909,7 @@ struct BurnDriver BurnDrvBlazeon = { "blazeon", NULL, NULL, NULL, "1991", "Blaze On (Japan)\0", NULL, "Atlus", "Kaneko 16-bit", NULL, NULL, NULL, NULL, - BDF_GAME_WORKING, 2, HARDWARE_MISC_POST90S, GBF_HORSHOOT, 0, + BDF_GAME_WORKING, 2, HARDWARE_KANEKO16, GBF_HORSHOOT, 0, NULL, BlazeonRomInfo, BlazeonRomName, NULL, NULL, BlazeonInputInfo, BlazeonDIPInfo, BlazeonInit, BlazeonExit, BlazeonFrame, NULL, BlazeonScan, NULL, 0x1000, 320, 232, 4, 3 @@ -4919,7 +4919,7 @@ struct BurnDriver BurnDrvBloodwar = { "bloodwar", NULL, NULL, NULL, "1994", "Blood Warrior\0", NULL, "Kaneko", "Kaneko 16-bit", NULL, NULL, NULL, NULL, - BDF_GAME_WORKING, 2, HARDWARE_MISC_POST90S, GBF_VSFIGHT, 0, + BDF_GAME_WORKING, 2, HARDWARE_KANEKO16, GBF_VSFIGHT, 0, NULL, BloodwarRomInfo, BloodwarRomName, NULL, NULL, BloodwarInputInfo, BloodwarDIPInfo, BloodwarInit, GtmrMachineExit, GtmrFrame, NULL, GtmrScan, NULL, 0x10000, 320, 240, 4, 3 @@ -4929,7 +4929,7 @@ struct BurnDriver BurnDrvBonkadv = { "bonkadv", NULL, NULL, NULL, "1994", "B.C. Kid / Bonk's Adventure / Kyukyoku!! PC Genjin\0", NULL, "Kaneko", "Kaneko 16-bit", NULL, NULL, NULL, NULL, - BDF_GAME_WORKING, 2, HARDWARE_MISC_POST90S, GBF_PLATFORM, 0, + BDF_GAME_WORKING, 2, HARDWARE_KANEKO16, GBF_PLATFORM, 0, NULL, BonkadvRomInfo, BonkadvRomName, NULL, NULL, BonkadvInputInfo, BonkadvDIPInfo, BonkadvInit, GtmrMachineExit, GtmrFrame, NULL, GtmrScan, NULL, 0x10000, 320, 240, 4, 3 @@ -4939,7 +4939,7 @@ struct BurnDriver BurnDrvExplbrkr = { "explbrkr", NULL, NULL, NULL, "1992", "Explosive Breaker\0", NULL, "Kaneko", "Kaneko 16-bit", NULL, NULL, NULL, NULL, - BDF_GAME_WORKING | BDF_ORIENTATION_VERTICAL | BDF_ORIENTATION_FLIPPED, 2, HARDWARE_MISC_POST90S, GBF_VERSHOOT, 0, + BDF_GAME_WORKING | BDF_ORIENTATION_VERTICAL | BDF_ORIENTATION_FLIPPED, 2, HARDWARE_KANEKO16, GBF_VERSHOOT, 0, NULL, ExplbrkrRomInfo, ExplbrkrRomName, NULL, NULL, ExplbrkrInputInfo, ExplbrkrDIPInfo, ExplbrkrInit, ExplbrkrExit, ExplbrkrFrame, NULL, ExplbrkrScan, NULL, 0x1000, 224, 256, 3, 4 @@ -4949,7 +4949,7 @@ struct BurnDriver BurnDrvBakubrkr = { "bakubrkr", "explbrkr", NULL, NULL, "1992", "Bakuretsu Breaker\0", NULL, "Kaneko", "Kaneko 16-bit", NULL, NULL, NULL, NULL, - BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL | BDF_ORIENTATION_FLIPPED, 2, HARDWARE_MISC_POST90S, GBF_VERSHOOT, 0, + BDF_GAME_WORKING | BDF_CLONE | BDF_ORIENTATION_VERTICAL | BDF_ORIENTATION_FLIPPED, 2, HARDWARE_KANEKO16, GBF_VERSHOOT, 0, NULL, BakubrkrRomInfo, BakubrkrRomName, NULL, NULL, ExplbrkrInputInfo, ExplbrkrDIPInfo, ExplbrkrInit, ExplbrkrExit, ExplbrkrFrame, NULL, ExplbrkrScan, NULL, 0x1000, 224, 256, 3, 4 @@ -4959,7 +4959,7 @@ struct BurnDriver BurnDrvGtmr = { "gtmr", NULL, NULL, NULL, "1994", "1000 Miglia: Great 1000 Miles Rally (94/07/18)\0", NULL, "Kaneko", "Kaneko 16-bit", NULL, NULL, NULL, NULL, - BDF_GAME_WORKING, 2, HARDWARE_MISC_POST90S, GBF_RACING, 0, + BDF_GAME_WORKING, 2, HARDWARE_KANEKO16, GBF_RACING, 0, NULL, GtmrRomInfo, GtmrRomName, NULL, NULL, GtmrInputInfo, GtmrDIPInfo, GtmrInit, GtmrMachineExit, GtmrFrame, NULL, GtmrScan, NULL, 0x10000, 320, 240, 4, 3 @@ -4969,7 +4969,7 @@ struct BurnDriver BurnDrvGtmra = { "gtmra", "gtmr", NULL, NULL, "1994", "1000 Miglia: Great 1000 Miles Rally (94/06/13)\0", NULL, "Kaneko", "Kaneko 16-bit", NULL, NULL, NULL, NULL, - BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_MISC_POST90S, GBF_RACING, 0, + BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_KANEKO16, GBF_RACING, 0, NULL, GtmraRomInfo, GtmraRomName, NULL, NULL, GtmrInputInfo, GtmrDIPInfo, GtmrInit, GtmrMachineExit, GtmrFrame, NULL, GtmrScan, NULL, 0x10000, 320, 240, 4, 3 @@ -4979,7 +4979,7 @@ struct BurnDriver BurnDrvGtmre = { "gtmre", "gtmr", NULL, NULL, "1994", "Great 1000 Miles Rally: Evolution Model!!! (94/09/06)\0", NULL, "Kaneko", "Kaneko 16-bit", NULL, NULL, NULL, NULL, - BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_MISC_POST90S, GBF_RACING, 0, + BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_KANEKO16, GBF_RACING, 0, NULL, GtmreRomInfo, GtmreRomName, NULL, NULL, GtmrInputInfo, GtmrDIPInfo, GtmrevoInit, GtmrMachineExit, GtmrFrame, NULL, GtmrScan, NULL, 0x10000, 320, 240, 4, 3 @@ -4989,7 +4989,7 @@ struct BurnDriver BurnDrvGtmrusa = { "gtmrusa", "gtmr", NULL, NULL, "1994", "Great 1000 Miles Rally: U.S.A Version! (94/09/06)\0", NULL, "Kaneko", "Kaneko 16-bit", NULL, NULL, NULL, NULL, - BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_MISC_POST90S, GBF_RACING, 0, + BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_KANEKO16, GBF_RACING, 0, NULL, GtmrusaRomInfo, GtmrusaRomName, NULL, NULL, GtmrInputInfo, GtmrDIPInfo, GtmrevoInit, GtmrMachineExit, GtmrFrame, NULL, GtmrScan, NULL, 0x10000, 320, 240, 4, 3 @@ -4999,7 +4999,7 @@ struct BurnDriver BurnDrvGtmr2 = { "gtmr2", NULL, NULL, NULL, "1995", "Mille Miglia 2: Great 1000 Miles Rally (95/05/24)\0", NULL, "Kaneko", "Kaneko 16-bit", NULL, NULL, NULL, NULL, - BDF_GAME_WORKING, 2, HARDWARE_MISC_POST90S, GBF_RACING, 0, + BDF_GAME_WORKING, 2, HARDWARE_KANEKO16, GBF_RACING, 0, NULL, Gtmr2RomInfo, Gtmr2RomName, NULL, NULL, GtmrInputInfo, Gtmr2DIPInfo, Gtmr2Init, GtmrMachineExit, GtmrFrame, NULL, GtmrScan, NULL, 0x10000, 320, 240, 4, 3 @@ -5009,7 +5009,7 @@ struct BurnDriver BurnDrvGtmr2a = { "gtmr2a", "gtmr2", NULL, NULL, "1995", "Mille Miglia 2: Great 1000 Miles Rally (95/04/04)\0", NULL, "Kaneko", "Kaneko 16-bit", NULL, NULL, NULL, NULL, - BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_MISC_POST90S, GBF_RACING, 0, + BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_KANEKO16, GBF_RACING, 0, NULL, Gtmr2aRomInfo, Gtmr2aRomName, NULL, NULL, GtmrInputInfo, Gtmr2DIPInfo, Gtmr2Init, GtmrMachineExit, GtmrFrame, NULL, GtmrScan, NULL, 0x10000, 320, 240, 4, 3 @@ -5019,7 +5019,7 @@ struct BurnDriver BurnDrvGtmr2u = { "gtmr2u", "gtmr2", NULL, NULL, "1995", "Great 1000 Miles Rally 2 USA (95/05/18)\0", NULL, "Kaneko", "Kaneko 16-bit", NULL, NULL, NULL, NULL, - BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_MISC_POST90S, GBF_RACING, 0, + BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_KANEKO16, GBF_RACING, 0, NULL, Gtmr2uRomInfo, Gtmr2uRomName, NULL, NULL, GtmrInputInfo, Gtmr2DIPInfo, Gtmr2uInit, GtmrMachineExit, GtmrFrame, NULL, GtmrScan, NULL, 0x10000, 320, 240, 4, 3 @@ -5029,7 +5029,7 @@ struct BurnDriver BurnDrvMgcrsytl = { "mgcrystl", NULL, NULL, NULL, "1991", "Magical Crystals (World, 92/01/10)\0", NULL, "Kaneko", "Kaneko 16-bit", NULL, NULL, NULL, NULL, - BDF_GAME_WORKING, 2, HARDWARE_MISC_POST90S, GBF_PLATFORM, 0, + BDF_GAME_WORKING, 2, HARDWARE_KANEKO16, GBF_PLATFORM, 0, NULL, MgcrystlRomInfo, MgcrystlRomName, NULL, NULL, MgcrystlInputInfo, MgcrystlDIPInfo, MgcrystlInit, ExplbrkrExit, ExplbrkrFrame, NULL, ExplbrkrScan, NULL, 0x1000, 256, 224, 4, 3 @@ -5039,7 +5039,7 @@ struct BurnDriver BurnDrvMgcrsytlo = { "mgcrystlo", "mgcrystl", NULL, NULL, "1991", "Magical Crystals (World, 91/12/10)\0", NULL, "Kaneko", "Kaneko 16-bit", NULL, NULL, NULL, NULL, - BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_MISC_POST90S, GBF_PLATFORM, 0, + BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_KANEKO16, GBF_PLATFORM, 0, NULL, MgcrystloRomInfo, MgcrystloRomName, NULL, NULL, MgcrystlInputInfo, MgcrystlDIPInfo, MgcrystlInit, ExplbrkrExit, ExplbrkrFrame, NULL, ExplbrkrScan, NULL, 0x1000, 256, 224, 4, 3 @@ -5049,7 +5049,7 @@ struct BurnDriver BurnDrvMgcrsytlj = { "mgcrystlj", "mgcrystl", NULL, NULL, "1991", "Magical Crystals (Japan, 92/01/13)\0", NULL, "Kaneko (Atlus license)", "Kaneko 16-bit", NULL, NULL, NULL, NULL, - BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_MISC_POST90S, GBF_PLATFORM, 0, + BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_KANEKO16, GBF_PLATFORM, 0, NULL, MgcrystljRomInfo, MgcrystljRomName, NULL, NULL, MgcrystlInputInfo, MgcrystlDIPInfo, MgcrystlInit, ExplbrkrExit, ExplbrkrFrame, NULL, ExplbrkrScan, NULL, 0x1000, 256, 224, 4, 3 diff --git a/src/burn/drivers/snes/d_snes.cpp b/src/burn/drivers/snes/d_snes.cpp index 98a575d55..2f3f025f8 100644 --- a/src/burn/drivers/snes/d_snes.cpp +++ b/src/burn/drivers/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_SEGA_MEGADRIVE, GBF_SHOOT,0 , + BDF_GAME_WORKING|BDF_16BIT_ONLY , 2, HARDWARE_NINTENDO_SNES, 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_SEGA_MEGADRIVE, GBF_SHOOT,0 , + BDF_GAME_WORKING|BDF_16BIT_ONLY , 2, HARDWARE_NINTENDO_SNES, 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_SEGA_MEGADRIVE, GBF_SHOOT,0 , + BDF_GAME_WORKING|BDF_16BIT_ONLY , 2, HARDWARE_NINTENDO_SNES, 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_SEGA_MEGADRIVE, GBF_SHOOT,0 , + BDF_GAME_WORKING|BDF_16BIT_ONLY , 2, HARDWARE_NINTENDO_SNES, 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/platform/win32/resource_string.h b/src/burner/platform/win32/resource_string.h index 11ff25d9f..f05970933 100644 --- a/src/burner/platform/win32/resource_string.h +++ b/src/burner/platform/win32/resource_string.h @@ -152,6 +152,8 @@ #define IDS_SEL_DEMO (IDS_STRING + 608) #define IDS_SEL_GENUINE (IDS_STRING + 610) #define IDS_SEL_SETSTATUS (IDS_STRING + 612) +#define IDS_SEL_KANEKO16 (IDS_STRING + 614) +#define IDS_SEL_SNES (IDS_STRING + 616) #define IDS_GENRE (IDS_STRING + 650) #define IDS_GENRE_HORSHOOT (IDS_STRING + 652) diff --git a/src/burner/platform/win32/sel.cpp b/src/burner/platform/win32/sel.cpp index 509fe4a4f..b7932b21d 100644 --- a/src/burner/platform/win32/sel.cpp +++ b/src/burner/platform/win32/sel.cpp @@ -42,6 +42,7 @@ HTREEITEM hFilterCps2 = NULL; HTREEITEM hFilterCps3 = NULL; HTREEITEM hFilterGalaxian = NULL; HTREEITEM hFilterIrem = NULL; +HTREEITEM hFilterKaneko16 = NULL; HTREEITEM hFilterKonami = NULL; HTREEITEM hFilterNeogeo = NULL; HTREEITEM hFilterPacman = NULL; @@ -51,6 +52,7 @@ HTREEITEM hFilterSega = NULL; HTREEITEM hFilterTaito = NULL; HTREEITEM hFilterToaplan = NULL; HTREEITEM hFilterMegadrive = NULL; +HTREEITEM hFilterSnes = NULL; HTREEITEM hFilterMiscPre90s = NULL; HTREEITEM hFilterMiscPost90s = NULL; HTREEITEM hFilterBootleg = NULL; @@ -144,11 +146,15 @@ static int GalaxianValue = HARDWARE_PREFIX_GALAXIAN >> 24; static int MASKGALAXIAN = 1 << GalaxianValue; static int IremValue = HARDWARE_PREFIX_IREM >> 24; static int MASKIREM = 1 << IremValue; +static int Kaneko16Value = HARDWARE_PREFIX_KANEKO16 >> 24; +static int MASKKANEKO16 = 1 << Kaneko16Value; +static int SnesValue = HARDWARE_PREFIX_NINTENDO_SNES >> 24; +static int MASKSNES = 1 << SnesValue; static int MiscPre90sValue = HARDWARE_PREFIX_MISC_PRE90S >> 24; static int MASKMISCPRE90S = 1 << MiscPre90sValue; static int MiscPost90sValue = HARDWARE_PREFIX_MISC_POST90S >> 24; static int MASKMISCPOST90S = 1 << MiscPost90sValue; -static int MASKALL = MASKCPS | MASKCPS2 | MASKCPS3 | MASKNEOGEO | MASKSEGA | MASKTOAPLAN | MASKCAVE | MASKPGM | MASKTAITO | MASKPSIKYO | MASKKONAMI | MASKPACMAN | MASKGALAXIAN | MASKIREM | MASKMEGADRIVE | MASKMISCPRE90S | MASKMISCPOST90S; +static int MASKALL = MASKCPS | MASKCPS2 | MASKCPS3 | MASKNEOGEO | MASKSEGA | MASKTOAPLAN | MASKCAVE | MASKPGM | MASKTAITO | MASKPSIKYO | MASKKONAMI | MASKPACMAN | MASKGALAXIAN | MASKIREM | MASKKANEKO16 | MASKMEGADRIVE | MASKSNES | MASKMISCPRE90S | MASKMISCPOST90S; #define AVAILONLY (1 << 24) #define AUTOEXPAND (1 << 25) @@ -889,6 +895,7 @@ static void CreateFilters() _TVCreateFiltersA(hHardware , IDS_SEL_CPS3 , hFilterCps3 , nLoadMenuShowX & MASKCPS3 ); _TVCreateFiltersA(hHardware , IDS_SEL_GALAXIAN , hFilterGalaxian , nLoadMenuShowX & MASKGALAXIAN ); _TVCreateFiltersA(hHardware , IDS_SEL_IREM , hFilterIrem , nLoadMenuShowX & MASKIREM ); + _TVCreateFiltersA(hHardware , IDS_SEL_KANEKO16 , hFilterKaneko16 , nLoadMenuShowX & MASKKANEKO16 ); _TVCreateFiltersA(hHardware , IDS_SEL_KONAMI , hFilterKonami , nLoadMenuShowX & MASKKONAMI ); _TVCreateFiltersA(hHardware , IDS_SEL_NEOGEO , hFilterNeogeo , nLoadMenuShowX & MASKNEOGEO ); _TVCreateFiltersA(hHardware , IDS_SEL_PACMAN , hFilterPacman , nLoadMenuShowX & MASKPACMAN ); @@ -900,6 +907,7 @@ static void CreateFilters() _TVCreateFiltersA(hHardware , IDS_SEL_MISCPRE90S , hFilterMiscPre90s , nLoadMenuShowX & MASKMISCPRE90S ); _TVCreateFiltersA(hHardware , IDS_SEL_MISCPOST90S , hFilterMiscPost90s , nLoadMenuShowX & MASKMISCPOST90S ); _TVCreateFiltersA(hHardware , IDS_SEL_MEGADRIVE , hFilterMegadrive , nLoadMenuShowX & MASKMEGADRIVE ); + _TVCreateFiltersA(hHardware , IDS_SEL_SNES , hFilterSnes , nLoadMenuShowX & MASKSNES ); SendMessage(hFilterList , TVM_EXPAND,TVE_EXPAND, (LPARAM)hRoot); SendMessage(hFilterList , TVM_EXPAND,TVE_EXPAND, (LPARAM)hHardware); @@ -1028,6 +1036,7 @@ static INT_PTR CALLBACK DialogProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lP _TreeView_SetCheckState(hFilterList, hFilterCps3, FALSE); _TreeView_SetCheckState(hFilterList, hFilterGalaxian, FALSE); _TreeView_SetCheckState(hFilterList, hFilterIrem, FALSE); + _TreeView_SetCheckState(hFilterList, hFilterKaneko16, FALSE); _TreeView_SetCheckState(hFilterList, hFilterKonami, FALSE); _TreeView_SetCheckState(hFilterList, hFilterNeogeo, FALSE); _TreeView_SetCheckState(hFilterList, hFilterPacman, FALSE); @@ -1039,6 +1048,7 @@ static INT_PTR CALLBACK DialogProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lP _TreeView_SetCheckState(hFilterList, hFilterMiscPre90s, FALSE); _TreeView_SetCheckState(hFilterList, hFilterMiscPost90s, FALSE); _TreeView_SetCheckState(hFilterList, hFilterMegadrive, FALSE); + _TreeView_SetCheckState(hFilterList, hFilterSnes, FALSE); nLoadMenuShowX |= MASKALL; } else { @@ -1050,6 +1060,7 @@ static INT_PTR CALLBACK DialogProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lP _TreeView_SetCheckState(hFilterList, hFilterCps3, TRUE); _TreeView_SetCheckState(hFilterList, hFilterGalaxian, TRUE); _TreeView_SetCheckState(hFilterList, hFilterIrem, TRUE); + _TreeView_SetCheckState(hFilterList, hFilterKaneko16, TRUE); _TreeView_SetCheckState(hFilterList, hFilterKonami, TRUE); _TreeView_SetCheckState(hFilterList, hFilterNeogeo, TRUE); _TreeView_SetCheckState(hFilterList, hFilterPacman, TRUE); @@ -1061,6 +1072,7 @@ static INT_PTR CALLBACK DialogProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lP _TreeView_SetCheckState(hFilterList, hFilterMiscPre90s, TRUE); _TreeView_SetCheckState(hFilterList, hFilterMiscPost90s, TRUE); _TreeView_SetCheckState(hFilterList, hFilterMegadrive, TRUE); + _TreeView_SetCheckState(hFilterList, hFilterSnes, TRUE); nLoadMenuShowX &= 0xff000000; } @@ -1186,6 +1198,7 @@ static INT_PTR CALLBACK DialogProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lP if (hItemChanged == hFilterCps3) _ToggleGameListing(nLoadMenuShowX, MASKCPS3); if (hItemChanged == hFilterGalaxian) _ToggleGameListing(nLoadMenuShowX, MASKGALAXIAN); if (hItemChanged == hFilterIrem) _ToggleGameListing(nLoadMenuShowX, MASKIREM); + if (hItemChanged == hFilterKaneko16) _ToggleGameListing(nLoadMenuShowX, MASKKANEKO16); if (hItemChanged == hFilterKonami) _ToggleGameListing(nLoadMenuShowX, MASKKONAMI); if (hItemChanged == hFilterNeogeo) _ToggleGameListing(nLoadMenuShowX, MASKNEOGEO); if (hItemChanged == hFilterPacman) _ToggleGameListing(nLoadMenuShowX, MASKPACMAN); @@ -1197,6 +1210,7 @@ static INT_PTR CALLBACK DialogProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lP if (hItemChanged == hFilterMiscPre90s) _ToggleGameListing(nLoadMenuShowX, MASKMISCPRE90S); if (hItemChanged == hFilterMiscPost90s) _ToggleGameListing(nLoadMenuShowX, MASKMISCPOST90S); if (hItemChanged == hFilterMegadrive) _ToggleGameListing(nLoadMenuShowX, MASKMEGADRIVE); + if (hItemChanged == hFilterSnes) _ToggleGameListing(nLoadMenuShowX, MASKSNES); if (hItemChanged == hFilterBootleg) _ToggleGameListing(nLoadMenuBoardTypeFilter, BDF_BOOTLEG); if (hItemChanged == hFilterDemo) _ToggleGameListing(nLoadMenuBoardTypeFilter, BDF_DEMO); diff --git a/src/burner/platform/win32/string.rc b/src/burner/platform/win32/string.rc index a5e7ff1d1..81df3fc2f 100644 --- a/src/burner/platform/win32/string.rc +++ b/src/burner/platform/win32/string.rc @@ -152,6 +152,8 @@ BEGIN IDS_SEL_DEMO "Demo" IDS_SEL_GENUINE "Genuine" IDS_SEL_SETSTATUS "Showing %i of %i sets [%i Unavailable sets]" + IDS_SEL_KANEKO16 "Kaneko16" + IDS_SEL_SNES "SNES" IDS_GENRE "Genre" IDS_GENRE_HORSHOOT "Shooter - Horizontal"