diff --git a/src/burner/win32/app.rc b/src/burner/win32/app.rc index 6bc6ea639..9f9bbcd5b 100644 --- a/src/burner/win32/app.rc +++ b/src/burner/win32/app.rc @@ -353,7 +353,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN DEFPUSHBUTTON "OK", IDOK, 79, 35, 50, 14 GROUPBOX "", IDC_STATIC, 3, 0, 128, 30 - RTEXT "Resolution:", IDC_STATIC, 8, 11, 48, 10, SS_CENTERIMAGE + RTEXT "Resolution:", IDC_RESOLUTION, 8, 11, 48, 10, SS_CENTERIMAGE COMBOBOX IDC_CHOOSE_LIST, 60, 10, 64, 128, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL PUSHBUTTON "Cancel", IDCANCEL, 25, 35, 50, 14 END @@ -569,63 +569,63 @@ BEGIN CONTROL "OK",IDOK,"Button",WS_TABSTOP,413,300,58,14 END -IDD_MVS_SELECT_CARTS DIALOGEX 0, 0, 319, 271 +IDD_MVS_SELECT_CARTS DIALOGEX 0, 0, 369, 271 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Select cartridges to load..." FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "", IDC_STATIC, 3, 0, 312, 247 + GROUPBOX "", IDC_STATIC, 3, 0, 362, 247 - DEFPUSHBUTTON "OK",IDOK,263,252,50,14 - PUSHBUTTON "Cancel",IDCANCEL,208,252,50,14 + DEFPUSHBUTTON "OK",IDOK,313,252,50,14 + PUSHBUTTON "Cancel",IDCANCEL,258,252,50,14 CONTROL "",IDC_MVS_CART1,"Static",SS_BITMAP | SS_REALSIZEIMAGE | SS_SUNKEN,8,8,48,36 - LTEXT "Slot 1", IDC_MVS_SLOT1,61,9,20,8,SS_CENTERIMAGE - CONTROL "", IDC_MVS_TEXTROMNAME1,"Edit",ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE,85,9,172,8 - CONTROL "", IDC_MVS_TEXTCOMMENT1,"Edit",ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE,61,21,196,8 - CONTROL "", IDC_MVS_TEXTSYSTEM1,"Edit",ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE,61,33,196,8 - PUSHBUTTON "Clear",IDC_MVS_CLEAR1,262,14,50,14 - PUSHBUTTON "Select...",IDC_MVS_SELECT1,262,30,50,14 + LTEXT "Slot 1", IDC_MVS_SLOT1,61,9,50,8,SS_CENTERIMAGE + CONTROL "", IDC_MVS_TEXTROMNAME1,"Edit",ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE,115,9,172,8 + CONTROL "", IDC_MVS_TEXTCOMMENT1,"Edit",ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE,61,21,226,8 + CONTROL "", IDC_MVS_TEXTSYSTEM1,"Edit",ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE,61,33,226,8 + PUSHBUTTON "Clear",IDC_MVS_CLEAR1,292,14,70,14 + PUSHBUTTON "Select...",IDC_MVS_SELECT1,292,30,70,14 CONTROL "",IDC_MVS_CART2,"Static",SS_BITMAP | SS_REALSIZEIMAGE | SS_SUNKEN,8,48,48,36 - LTEXT "Slot 2", IDC_MVS_SLOT2,61,49,20,8,SS_CENTERIMAGE - CONTROL "", IDC_MVS_TEXTROMNAME2,"Edit",ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE,85,49,172,8 - CONTROL "", IDC_MVS_TEXTCOMMENT2,"Edit",ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE,61,61,196,8 - CONTROL "", IDC_MVS_TEXTSYSTEM2,"Edit",ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE,61,73,196,8 - PUSHBUTTON "Clear",IDC_MVS_CLEAR2,262,54,50,14 - PUSHBUTTON "Select...",IDC_MVS_SELECT2,262,70,50,14 + LTEXT "Slot 2", IDC_MVS_SLOT2,61,49,50,8,SS_CENTERIMAGE + CONTROL "", IDC_MVS_TEXTROMNAME2,"Edit",ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE,115,49,172,8 + CONTROL "", IDC_MVS_TEXTCOMMENT2,"Edit",ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE,61,61,226,8 + CONTROL "", IDC_MVS_TEXTSYSTEM2,"Edit",ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE,61,73,226,8 + PUSHBUTTON "Clear",IDC_MVS_CLEAR2,292,54,70,14 + PUSHBUTTON "Select...",IDC_MVS_SELECT2,292,70,70,14 CONTROL "",IDC_MVS_CART3,"Static",SS_BITMAP | SS_REALSIZEIMAGE | SS_SUNKEN,8,88,48,36 - LTEXT "Slot 3", IDC_MVS_SLOT3,61,89,20,8,SS_CENTERIMAGE - CONTROL "", IDC_MVS_TEXTROMNAME3,"Edit",ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE,85,89,172,8 - CONTROL "", IDC_MVS_TEXTCOMMENT3,"Edit",ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE,61,101,196,8 - CONTROL "", IDC_MVS_TEXTSYSTEM3,"Edit",ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE,61,113,196,8 - PUSHBUTTON "Clear",IDC_MVS_CLEAR3,262,94,50,14 - PUSHBUTTON "Select...",IDC_MVS_SELECT3,262,110,50,14 + LTEXT "Slot 3", IDC_MVS_SLOT3,61,89,50,8,SS_CENTERIMAGE + CONTROL "", IDC_MVS_TEXTROMNAME3,"Edit",ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE,115,89,172,8 + CONTROL "", IDC_MVS_TEXTCOMMENT3,"Edit",ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE,61,101,226,8 + CONTROL "", IDC_MVS_TEXTSYSTEM3,"Edit",ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE,61,113,226,8 + PUSHBUTTON "Clear",IDC_MVS_CLEAR3,292,94,70,14 + PUSHBUTTON "Select...",IDC_MVS_SELECT3,292,110,70,14 CONTROL "",IDC_MVS_CART4,"Static",SS_BITMAP | SS_REALSIZEIMAGE | SS_SUNKEN,8,128,48,36 - LTEXT "Slot 4", IDC_MVS_SLOT4,61,129,20,8,SS_CENTERIMAGE - CONTROL "", IDC_MVS_TEXTROMNAME4,"Edit",ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE,85,129,172,8 - CONTROL "", IDC_MVS_TEXTCOMMENT4,"Edit",ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE,61,141,196,8 - CONTROL "", IDC_MVS_TEXTSYSTEM4,"Edit",ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE,61,153,196,8 - PUSHBUTTON "Clear",IDC_MVS_CLEAR4,262,134,50,14 - PUSHBUTTON "Select...",IDC_MVS_SELECT4,262,150,50,14 + LTEXT "Slot 4", IDC_MVS_SLOT4,61,129,50,8,SS_CENTERIMAGE + CONTROL "", IDC_MVS_TEXTROMNAME4,"Edit",ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE,115,129,172,8 + CONTROL "", IDC_MVS_TEXTCOMMENT4,"Edit",ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE,61,141,226,8 + CONTROL "", IDC_MVS_TEXTSYSTEM4,"Edit",ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE,61,153,226,8 + PUSHBUTTON "Clear",IDC_MVS_CLEAR4,292,134,70,14 + PUSHBUTTON "Select...",IDC_MVS_SELECT4,292,150,70,14 CONTROL "",IDC_MVS_CART5,"Static",SS_BITMAP | SS_REALSIZEIMAGE | SS_SUNKEN,8,168,48,36 - LTEXT "Slot 5", IDC_MVS_SLOT5,61,169,20,8,SS_CENTERIMAGE - CONTROL "", IDC_MVS_TEXTROMNAME5,"Edit",ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE,85,169,172,8 - CONTROL "", IDC_MVS_TEXTCOMMENT5,"Edit",ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE,61,181,196,8 - CONTROL "", IDC_MVS_TEXTSYSTEM5,"Edit",ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE,61,193,196,8 - PUSHBUTTON "Clear",IDC_MVS_CLEAR5,262,174,50,14 - PUSHBUTTON "Select...",IDC_MVS_SELECT5,262,190,50,14 + LTEXT "Slot 5", IDC_MVS_SLOT5,61,169,50,8,SS_CENTERIMAGE + CONTROL "", IDC_MVS_TEXTROMNAME5,"Edit",ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE,115,169,172,8 + CONTROL "", IDC_MVS_TEXTCOMMENT5,"Edit",ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE,61,181,226,8 + CONTROL "", IDC_MVS_TEXTSYSTEM5,"Edit",ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE,61,193,226,8 + PUSHBUTTON "Clear",IDC_MVS_CLEAR5,292,174,70,14 + PUSHBUTTON "Select...",IDC_MVS_SELECT5,292,190,70,14 CONTROL "",IDC_MVS_CART6,"Static",SS_BITMAP | SS_REALSIZEIMAGE | SS_SUNKEN,8,208,48,36 - LTEXT "Slot 6", IDC_MVS_SLOT6,61,209,20,8,SS_CENTERIMAGE - CONTROL "", IDC_MVS_TEXTROMNAME6,"Edit",ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE,85,209,172,8 - CONTROL "", IDC_MVS_TEXTCOMMENT6,"Edit",ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE,61,221,196,8 - CONTROL "", IDC_MVS_TEXTSYSTEM6,"Edit",ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE,61,233,196,8 - PUSHBUTTON "Clear",IDC_MVS_CLEAR6,262,214,50,14 - PUSHBUTTON "Select...",IDC_MVS_SELECT6,262,230,50,14 + LTEXT "Slot 6", IDC_MVS_SLOT6,61,209,50,8,SS_CENTERIMAGE + CONTROL "", IDC_MVS_TEXTROMNAME6,"Edit",ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE,115,209,172,8 + CONTROL "", IDC_MVS_TEXTCOMMENT6,"Edit",ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE,61,221,226,8 + CONTROL "", IDC_MVS_TEXTSYSTEM6,"Edit",ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | WS_CHILD | WS_VISIBLE,61,233,226,8 + PUSHBUTTON "Clear",IDC_MVS_CLEAR6,292,214,70,14 + PUSHBUTTON "Select...",IDC_MVS_SELECT6,292,230,70,14 END IDD_NCD_DLG DIALOGEX 0, 0, 520, 291 @@ -958,7 +958,6 @@ BEGIN MENUITEM "&What's New", MENU_WHATSNEW MENUITEM SEPARATOR MENUITEM "&FB Alpha homepage", MENU_WWW_HOME - MENUITEM "FB Alpha &forums", MENU_WWW_FORUM MENUITEM "&Neo-Source forums", MENU_WWW_NSFORUM MENUITEM SEPARATOR MENUITEM "&System information", MENU_SYSINFO @@ -970,19 +969,19 @@ IDR_MENU_BLITTER_1 MENU BEGIN POPUP "Basic\t(DirectDraw 7)" BEGIN - MENUITEM "&No effects", MENU_NORMAL - MENUITEM "&Scanlines", MENU_SCAN + MENUITEM "&No effects", MENU_BASIC_NORMAL + MENUITEM "&Scanlines", MENU_BASIC_SCAN MENUITEM "Scanlines &50%", MENU_SCAN50 MENUITEM SEPARATOR - MENUITEM "&Rotate scanlines", MENU_ROTSCAN + MENUITEM "&Rotate scanlines", MENU_BASIC_ROTSCAN MENUITEM SEPARATOR MENUITEM "Force &Flip", MENU_FORCE_FLIP MENUITEM SEPARATOR POPUP "Buffering &method" BEGIN - MENUITEM "&Autodetect", MENU_MEMAUTO - MENUITEM "&Video memory", MENU_VIDEOMEM - MENUITEM "&System memory", MENU_SYSMEM + MENUITEM "&Autodetect", MENU_BASIC_MEMAUTO + MENUITEM "&Video memory", MENU_BASIC_VIDEOMEM + MENUITEM "&System memory", MENU_BASIC_SYSMEM END END END @@ -994,48 +993,48 @@ BEGIN MENUITEM "Disable all effects", MENU_DISABLEFX MENUITEM SEPARATOR MENUITEM "Enable &bi-linear filtering", MENU_BILINEAR - MENUITEM "&Rotate scanlines and RGB effects", MENU_ROTSCAN + MENUITEM "&Rotate scanlines and RGB effects", MENU_ENHANCED_ROTSCAN MENUITEM SEPARATOR MENUITEM "Enable &Pre-scale", MENU_PRESCALE MENUITEM "Pre-scale using Soft&FX", MENU_SOFTFX POPUP "SoftFX algorithm" BEGIN - MENUITEM "Double pixels (3D hardware)", MENU_SOFT_STRETCH - MENUITEM "AdvanceMAME Scale2x", MENU_SOFT_SCALE2X - MENUITEM "AdvanceMAME Scale3x", MENU_SOFT_SCALE3X - MENUITEM "2xPM LQ", MENU_SOFT_2XPM_LQ - MENUITEM "2xPM HQ", MENU_SOFT_2XPM_HQ - MENUITEM "Eagle Graphics", MENU_SOFT_EAGLE - MENUITEM "Super Eagle", MENU_SOFT_SUPEREAGLE - MENUITEM "2xSaI", MENU_SOFT_2XSAI - MENUITEM "Super 2xSaI", MENU_SOFT_SUPER2XSAI - MENUITEM "Super Eagle (VBA)", MENU_SOFT_SUPEREAGLE_VBA - MENUITEM "2xSaI (VBA)", MENU_SOFT_2XSAI_VBA - MENUITEM "Super 2xSaI (VBA)", MENU_SOFT_SUPER2XSAI_VBA - MENUITEM "SuperScale", MENU_SOFT_SUPERSCALE - MENUITEM "SuperScale (75% Scanlines)", MENU_SOFT_SUPERSCALE75 - MENUITEM "hq2x Filter", MENU_SOFT_HQ2X - MENUITEM "hq3x Filter", MENU_SOFT_HQ3X - MENUITEM "hq4x Filter", MENU_SOFT_HQ4X - MENUITEM "hq2xS (VBA) Filter", MENU_SOFT_HQ2XS_VBA - MENUITEM "hq3xS (VBA) Filter", MENU_SOFT_HQ3XS_VBA, GRAYED - MENUITEM "hq2xS (SNES9X) Filter", MENU_SOFT_HQ2XS_SNES9X - MENUITEM "hq3xS (SNEX9X) Filter", MENU_SOFT_HQ3XS_SNES9X - MENUITEM "hq2xBold Filter", MENU_SOFT_HQ2XBOLD - MENUITEM "hq3xBold Filter", MENU_SOFT_HQ3XBOLD - MENUITEM "EPXB Filter", MENU_SOFT_EPXB - MENUITEM "EPXC Filter", MENU_SOFT_EPXC + MENUITEM "Double pixels (3D hardware)", MENU_ENHANCED_SOFT_STRETCH + MENUITEM "AdvanceMAME Scale2x", MENU_ENHANCED_SOFT_SCALE2X + MENUITEM "AdvanceMAME Scale3x", MENU_ENHANCED_SOFT_SCALE3X + MENUITEM "2xPM LQ", MENU_ENHANCED_SOFT_2XPM_LQ + MENUITEM "2xPM HQ", MENU_ENHANCED_SOFT_2XPM_HQ + MENUITEM "Eagle Graphics", MENU_ENHANCED_SOFT_EAGLE + MENUITEM "Super Eagle", MENU_ENHANCED_SOFT_SUPEREAGLE + MENUITEM "2xSaI", MENU_ENHANCED_SOFT_2XSAI + MENUITEM "Super 2xSaI", MENU_ENHANCED_SOFT_SUPER2XSAI + MENUITEM "Super Eagle (VBA)", MENU_ENHANCED_SOFT_SUPEREAGLE_VBA + MENUITEM "2xSaI (VBA)", MENU_ENHANCED_SOFT_2XSAI_VBA + MENUITEM "Super 2xSaI (VBA)", MENU_ENHANCED_SOFT_SUPER2XSAI_VBA + MENUITEM "SuperScale", MENU_ENHANCED_SOFT_SUPERSCALE + MENUITEM "SuperScale (75% Scanlines)", MENU_ENHANCED_SOFT_SUPERSCALE75 + MENUITEM "hq2x Filter", MENU_ENHANCED_SOFT_HQ2X + MENUITEM "hq3x Filter", MENU_ENHANCED_SOFT_HQ3X + MENUITEM "hq4x Filter", MENU_ENHANCED_SOFT_HQ4X + MENUITEM "hq2xS (VBA) Filter", MENU_ENHANCED_SOFT_HQ2XS_VBA + MENUITEM "hq3xS (VBA) Filter", MENU_ENHANCED_SOFT_HQ3XS_VBA, GRAYED + MENUITEM "hq2xS (SNES9X) Filter", MENU_ENHANCED_SOFT_HQ2XS_SNES9X + MENUITEM "hq3xS (SNEX9X) Filter", MENU_ENHANCED_SOFT_HQ3XS_SNES9X + MENUITEM "hq2xBold Filter", MENU_ENHANCED_SOFT_HQ2XBOLD + MENUITEM "hq3xBold Filter", MENU_ENHANCED_SOFT_HQ3XBOLD + MENUITEM "EPXB Filter", MENU_ENHANCED_SOFT_EPXB + MENUITEM "EPXC Filter", MENU_ENHANCED_SOFT_EPXC MENUITEM SEPARATOR - MENUITEM "Force image to SoftFX size", MENU_SOFT_AUTOSIZE + MENUITEM "Force image to SoftFX size", MENU_ENHANCED_SOFT_AUTOSIZE END MENUITEM SEPARATOR - MENUITEM "Enable &Scanlines", MENU_SCAN - MENUITEM "Set scanline &intensity...", MENU_SCANINTENSITY + MENUITEM "Enable &Scanlines", MENU_ENHANCED_SCAN + MENUITEM "Set scanline &intensity...", MENU_ENHANCED_SCANINTENSITY MENUITEM SEPARATOR MENUITEM "Enable phosphor &feedback", MENU_PHOSPHOR MENUITEM "Set &phosphor feedback intensity...", MENU_PHOSPHORINTENSITY MENUITEM SEPARATOR - MENUITEM "&No effects", MENU_NORMAL + MENUITEM "&No effects", MENU_ENHANCED_NORMAL MENUITEM "RGB &effects", MENU_RGBEFFECTS MENUITEM "&3D projection", MENU_3DPROJECTION MENUITEM SEPARATOR @@ -1069,38 +1068,38 @@ IDR_MENU_BLITTER_3 MENU BEGIN POPUP "SoftFX\t(DirectDraw 7)" BEGIN - MENUITEM "&Double pixels (Software)", MENU_SOFT_STRETCH - MENUITEM "AdvanceMAME Scale2x\t(16/32-bit only)", MENU_SOFT_SCALE2X - MENUITEM "AdvanceMAME Scale3x\t(16/32-bit only)", MENU_SOFT_SCALE3X - MENUITEM "2xPM LQ\t(15/16-bit only)", MENU_SOFT_2XPM_LQ - MENUITEM "2xPM HQ\t(15/16-bit only)", MENU_SOFT_2XPM_HQ - MENUITEM "Eagle Graphics\t(16-bit only)", MENU_SOFT_EAGLE - MENUITEM "Super Eagle\t(15/16-bit only)", MENU_SOFT_SUPEREAGLE - MENUITEM "2xSaI\t(15/16-bit only)", MENU_SOFT_2XSAI - MENUITEM "Super 2xSaI\t(15/16-bit only)", MENU_SOFT_SUPER2XSAI - MENUITEM "Super Eagle (VBA)\t(15/16/32-bit only)", MENU_SOFT_SUPEREAGLE_VBA - MENUITEM "2xSaI (VBA)\t(15/16/32-bit only)", MENU_SOFT_2XSAI_VBA - MENUITEM "Super 2xSaI (VBA)\t(15/16/32-bit only)", MENU_SOFT_SUPER2XSAI_VBA - MENUITEM "SuperScale\t(15/16-bit only)", MENU_SOFT_SUPERSCALE - MENUITEM "SuperScale (75% Scanlines)\t(15/16-bit only)",MENU_SOFT_SUPERSCALE75 - MENUITEM "hq2x filter\t(32-bit only)", MENU_SOFT_HQ2X - MENUITEM "hq3x filter\t(32-bit only)", MENU_SOFT_HQ3X - MENUITEM "hq4x filter\t(32-bit only)", MENU_SOFT_HQ4X - MENUITEM "hq2xS (VBA) filter\t(16/32-bit only)", MENU_SOFT_HQ2XS_VBA - MENUITEM "hq3xS (VBA) filter\t(16/32-bit only)", MENU_SOFT_HQ3XS_VBA, GRAYED - MENUITEM "hq2xS (SNES9X) Filter\t(16-bit only)", MENU_SOFT_HQ2XS_SNES9X - MENUITEM "hq3xS (SNEX9X) Filter\t(16-bit only)", MENU_SOFT_HQ3XS_SNES9X - MENUITEM "hq2xBold Filter\t(16-bit only)", MENU_SOFT_HQ2XBOLD - MENUITEM "hq3xBold Filter\t(16-bit only)", MENU_SOFT_HQ3XBOLD - MENUITEM "EPXB Filter\t(16-bit only)", MENU_SOFT_EPXB - MENUITEM "EPXC Filter\t(16-bit only)", MENU_SOFT_EPXC + MENUITEM "&Double pixels (Software)", MENU_SOFTFX_SOFT_STRETCH + MENUITEM "AdvanceMAME Scale2x\t(16/32-bit only)", MENU_SOFTFX_SOFT_SCALE2X + MENUITEM "AdvanceMAME Scale3x\t(16/32-bit only)", MENU_SOFTFX_SOFT_SCALE3X + MENUITEM "2xPM LQ\t(15/16-bit only)", MENU_SOFTFX_SOFT_2XPM_LQ + MENUITEM "2xPM HQ\t(15/16-bit only)", MENU_SOFTFX_SOFT_2XPM_HQ + MENUITEM "Eagle Graphics\t(16-bit only)", MENU_SOFTFX_SOFT_EAGLE + MENUITEM "Super Eagle\t(15/16-bit only)", MENU_SOFTFX_SOFT_SUPEREAGLE + MENUITEM "2xSaI\t(15/16-bit only)", MENU_SOFTFX_SOFT_2XSAI + MENUITEM "Super 2xSaI\t(15/16-bit only)", MENU_SOFTFX_SOFT_SUPER2XSAI + MENUITEM "Super Eagle (VBA)\t(15/16/32-bit only)", MENU_SOFTFX_SOFT_SUPEREAGLE_VBA + MENUITEM "2xSaI (VBA)\t(15/16/32-bit only)", MENU_SOFTFX_SOFT_2XSAI_VBA + MENUITEM "Super 2xSaI (VBA)\t(15/16/32-bit only)", MENU_SOFTFX_SOFT_SUPER2XSAI_VBA + MENUITEM "SuperScale\t(15/16-bit only)", MENU_SOFTFX_SOFT_SUPERSCALE + MENUITEM "SuperScale (75% Scanlines)\t(15/16-bit only)",MENU_SOFTFX_SOFT_SUPERSCALE75 + MENUITEM "hq2x filter\t(32-bit only)", MENU_SOFTFX_SOFT_HQ2X + MENUITEM "hq3x filter\t(32-bit only)", MENU_SOFTFX_SOFT_HQ3X + MENUITEM "hq4x filter\t(32-bit only)", MENU_SOFTFX_SOFT_HQ4X + MENUITEM "hq2xS (VBA) filter\t(16/32-bit only)", MENU_SOFTFX_SOFT_HQ2XS_VBA + MENUITEM "hq3xS (VBA) filter\t(16/32-bit only)", MENU_SOFTFX_SOFT_HQ3XS_VBA, GRAYED + MENUITEM "hq2xS (SNES9X) Filter\t(16-bit only)", MENU_SOFTFX_SOFT_HQ2XS_SNES9X + MENUITEM "hq3xS (SNEX9X) Filter\t(16-bit only)", MENU_SOFTFX_SOFT_HQ3XS_SNES9X + MENUITEM "hq2xBold Filter\t(16-bit only)", MENU_SOFTFX_SOFT_HQ2XBOLD + MENUITEM "hq3xBold Filter\t(16-bit only)", MENU_SOFTFX_SOFT_HQ3XBOLD + MENUITEM "EPXB Filter\t(16-bit only)", MENU_SOFTFX_SOFT_EPXB + MENUITEM "EPXC Filter\t(16-bit only)", MENU_SOFTFX_SOFT_EPXC MENUITEM SEPARATOR - MENUITEM "&Force image to SoftFX size", MENU_SOFT_AUTOSIZE + MENUITEM "&Force image to SoftFX size", MENU_SOFTFX_SOFT_AUTOSIZE POPUP "Buffering &method" BEGIN - MENUITEM "&Autodetect", MENU_MEMAUTO - MENUITEM "&Video memory", MENU_VIDEOMEM - MENUITEM "&System memory", MENU_SYSMEM + MENUITEM "&Autodetect", MENU_SOFTFX_MEMAUTO + MENUITEM "&Video memory", MENU_SOFTFX_VIDEOMEM + MENUITEM "&System memory", MENU_SOFTFX_SYSMEM MENUITEM SEPARATOR MENUITEM "Directly access video memory", MENU_SOFT_DIRECTACCESS END @@ -1129,8 +1128,8 @@ BEGIN MENUITEM "Mitchell-Netravali free...", MENU_DX9_CUBIC_CUSTOM, GRAYED END MENUITEM SEPARATOR - MENUITEM "Enable &Scanlines", MENU_SCAN - MENUITEM "Set scanline &intensity...", MENU_SCANINTENSITY + MENUITEM "Enable &Scanlines", MENU_EXP_SCAN + MENUITEM "Set scanline &intensity...", MENU_EXP_SCANINTENSITY MENUITEM SEPARATOR POPUP "Advanced settings" BEGIN @@ -1158,33 +1157,33 @@ BEGIN MENUITEM SEPARATOR POPUP "SoftFX algorithm" BEGIN - MENUITEM "Double pixels (3D hardware)", MENU_SOFT_STRETCH - MENUITEM "AdvanceMAME Scale2x", MENU_SOFT_SCALE2X - MENUITEM "AdvanceMAME Scale3x", MENU_SOFT_SCALE3X - MENUITEM "2xPM LQ", MENU_SOFT_2XPM_LQ - MENUITEM "2xPM HQ", MENU_SOFT_2XPM_HQ - MENUITEM "Eagle Graphics", MENU_SOFT_EAGLE - MENUITEM "Super Eagle", MENU_SOFT_SUPEREAGLE - MENUITEM "2xSaI", MENU_SOFT_2XSAI - MENUITEM "Super 2xSaI", MENU_SOFT_SUPER2XSAI - MENUITEM "Super Eagle (VBA)", MENU_SOFT_SUPEREAGLE_VBA - MENUITEM "2xSaI (VBA)", MENU_SOFT_2XSAI_VBA - MENUITEM "Super 2xSaI (VBA)", MENU_SOFT_SUPER2XSAI_VBA - MENUITEM "SuperScale", MENU_SOFT_SUPERSCALE - MENUITEM "SuperScale (75% Scanlines)", MENU_SOFT_SUPERSCALE75 - MENUITEM "hq2x Filter", MENU_SOFT_HQ2X - MENUITEM "hq3x Filter", MENU_SOFT_HQ3X - MENUITEM "hq4x Filter", MENU_SOFT_HQ4X - MENUITEM "hq2xS (VBA) Filter", MENU_SOFT_HQ2XS_VBA - MENUITEM "hq3xS (VBA) Filter", MENU_SOFT_HQ3XS_VBA, GRAYED - MENUITEM "hq2xS (SNES9X) Filter", MENU_SOFT_HQ2XS_SNES9X - MENUITEM "hq3xS (SNEX9X) Filter", MENU_SOFT_HQ3XS_SNES9X - MENUITEM "hq2xBold Filter", MENU_SOFT_HQ2XBOLD - MENUITEM "hq3xBold Filter", MENU_SOFT_HQ3XBOLD - MENUITEM "EPXB Filter", MENU_SOFT_EPXB - MENUITEM "EPXC Filter", MENU_SOFT_EPXC + MENUITEM "Double pixels (3D hardware)", MENU_DX9_ALT_SOFT_STRETCH + MENUITEM "AdvanceMAME Scale2x", MENU_DX9_ALT_SOFT_SCALE2X + MENUITEM "AdvanceMAME Scale3x", MENU_DX9_ALT_SOFT_SCALE3X + MENUITEM "2xPM LQ", MENU_DX9_ALT_SOFT_2XPM_LQ + MENUITEM "2xPM HQ", MENU_DX9_ALT_SOFT_2XPM_HQ + MENUITEM "Eagle Graphics", MENU_DX9_ALT_SOFT_EAGLE + MENUITEM "Super Eagle", MENU_DX9_ALT_SOFT_SUPEREAGLE + MENUITEM "2xSaI", MENU_DX9_ALT_SOFT_2XSAI + MENUITEM "Super 2xSaI", MENU_DX9_ALT_SOFT_SUPER2XSAI + MENUITEM "Super Eagle (VBA)", MENU_DX9_ALT_SOFT_SUPEREAGLE_VBA + MENUITEM "2xSaI (VBA)", MENU_DX9_ALT_SOFT_2XSAI_VBA + MENUITEM "Super 2xSaI (VBA)", MENU_DX9_ALT_SOFT_SUPER2XSAI_VBA + MENUITEM "SuperScale", MENU_DX9_ALT_SOFT_SUPERSCALE + MENUITEM "SuperScale (75% Scanlines)", MENU_DX9_ALT_SOFT_SUPERSCALE75 + MENUITEM "hq2x Filter", MENU_DX9_ALT_SOFT_HQ2X + MENUITEM "hq3x Filter", MENU_DX9_ALT_SOFT_HQ3X + MENUITEM "hq4x Filter", MENU_DX9_ALT_SOFT_HQ4X + MENUITEM "hq2xS (VBA) Filter", MENU_DX9_ALT_SOFT_HQ2XS_VBA + MENUITEM "hq3xS (VBA) Filter", MENU_DX9_ALT_SOFT_HQ3XS_VBA, GRAYED + MENUITEM "hq2xS (SNES9X) Filter", MENU_DX9_ALT_SOFT_HQ2XS_SNES9X + MENUITEM "hq3xS (SNEX9X) Filter", MENU_DX9_ALT_SOFT_HQ3XS_SNES9X + MENUITEM "hq2xBold Filter", MENU_DX9_ALT_SOFT_HQ2XBOLD + MENUITEM "hq3xBold Filter", MENU_DX9_ALT_SOFT_HQ3XBOLD + MENUITEM "EPXB Filter", MENU_DX9_ALT_SOFT_EPXB + MENUITEM "EPXC Filter", MENU_DX9_ALT_SOFT_EPXC MENUITEM SEPARATOR - MENUITEM "Force image to SoftFX size", MENU_SOFT_AUTOSIZE + MENUITEM "Force image to SoftFX size", MENU_DX9_ALT_SOFT_AUTOSIZE END MENUITEM SEPARATOR POPUP "Advanced settings" diff --git a/src/burner/win32/menu.cpp b/src/burner/win32/menu.cpp index 0a5548c0a..d810be62e 100644 --- a/src/burner/win32/menu.cpp +++ b/src/burner/win32/menu.cpp @@ -664,58 +664,58 @@ void MenuUpdate() if (bVidScanHalf) { var = MENU_SCAN50; } else { - var = MENU_SCAN; + var = MENU_BASIC_SCAN; } } else { - var = MENU_NORMAL; + var = MENU_BASIC_NORMAL; } - CheckMenuRadioItem(hMenu, MENU_NORMAL, MENU_SCAN50, var, MF_BYCOMMAND); - CheckMenuItem(hMenu, MENU_ROTSCAN, bVidScanRotate ? MF_CHECKED : MF_UNCHECKED); + CheckMenuRadioItem(hMenu, MENU_BASIC_NORMAL, MENU_SCAN50, var, MF_BYCOMMAND); + CheckMenuItem(hMenu, MENU_BASIC_ROTSCAN, bVidScanRotate ? MF_CHECKED : MF_UNCHECKED); CheckMenuItem(hMenu, MENU_FORCE_FLIP, bVidForceFlip ? MF_CHECKED : MF_UNCHECKED); CheckMenuItem(hMenu, MENU_RES_ARCADE, bVidArcaderes ? MF_CHECKED : MF_UNCHECKED); break; case 1: CheckMenuItem(hMenu, MENU_BILINEAR, bVidBilinear ? MF_CHECKED : MF_UNCHECKED); - CheckMenuItem(hMenu, MENU_SCAN, bVidScanlines ? MF_CHECKED : MF_UNCHECKED); + CheckMenuItem(hMenu, MENU_ENHANCED_SCAN, bVidScanlines ? MF_CHECKED : MF_UNCHECKED); CheckMenuItem(hMenu, MENU_PHOSPHOR, bVidScanDelay ? MF_CHECKED : MF_UNCHECKED); CheckMenuItem(hMenu, MENU_PRESCALE, nVidBlitterOpt[nVidSelect] & 0x01000000 ? MF_CHECKED : MF_UNCHECKED); CheckMenuItem(hMenu, MENU_SOFTFX, nVidBlitterOpt[nVidSelect] & 0x02000000 ? MF_CHECKED : MF_UNCHECKED); - var = ((unsigned long long)nVidBlitterOpt[nVidSelect] >> 32) + MENU_SOFT_STRETCH; - CheckMenuRadioItem(hMenu, MENU_SOFT_STRETCH, MENU_SOFT_STRETCH + 25, var, MF_BYCOMMAND); - CheckMenuItem(hMenu, MENU_SOFT_AUTOSIZE, (nVidBlitterOpt[nVidSelect] & 0x04000000) ? MF_CHECKED : MF_UNCHECKED); + var = ((unsigned long long)nVidBlitterOpt[nVidSelect] >> 32) + MENU_ENHANCED_SOFT_STRETCH; + CheckMenuRadioItem(hMenu, MENU_ENHANCED_SOFT_STRETCH, MENU_ENHANCED_SOFT_STRETCH + 25, var, MF_BYCOMMAND); + CheckMenuItem(hMenu, MENU_ENHANCED_SOFT_AUTOSIZE, (nVidBlitterOpt[nVidSelect] & 0x04000000) ? MF_CHECKED : MF_UNCHECKED); if (nVidBlitterOpt[nVidSelect] & 0x00100000) { var = MENU_3DPROJECTION; } else { if (nVidBlitterOpt[nVidSelect] & 0x00010000) { var = MENU_RGBEFFECTS; } else { - var = MENU_NORMAL; + var = MENU_ENHANCED_NORMAL; } } - CheckMenuRadioItem(hMenu, MENU_NORMAL, MENU_NORMAL, var, MF_BYCOMMAND); + CheckMenuRadioItem(hMenu, MENU_ENHANCED_NORMAL, MENU_ENHANCED_NORMAL, var, MF_BYCOMMAND); CheckMenuRadioItem(hMenu, MENU_RGBEFFECTS, MENU_3DPROJECTION, var, MF_BYCOMMAND); CheckMenuItem(hMenu, MENU_EFFECT_AUTO, (nVidBlitterOpt[nVidSelect] & 0x00020000) ? MF_CHECKED : MF_UNCHECKED); var = MENU_EFFECT_01 + (nVidBlitterOpt[nVidSelect] & 0x000000FF) - 8; CheckMenuRadioItem(hMenu, MENU_EFFECT_01, MENU_EFFECT_08, var, MF_BYCOMMAND); CheckMenuItem(hMenu, MENU_3DUSELIGHTING, nVidBlitterOpt[nVidSelect] & 0x00200000 ? MF_CHECKED : MF_UNCHECKED); - CheckMenuItem(hMenu, MENU_ROTSCAN, bVidScanRotate ? MF_CHECKED : MF_UNCHECKED); + CheckMenuItem(hMenu, MENU_ENHANCED_ROTSCAN, bVidScanRotate ? MF_CHECKED : MF_UNCHECKED); CheckMenuItem(hMenu, MENU_FORCE_16BIT, bVidForce16bit ? MF_CHECKED : MF_UNCHECKED); CheckMenuItem(hMenu, MENU_TEXTUREMANAGE, (nVidTransferMethod & 1) ? MF_CHECKED : MF_UNCHECKED); CheckMenuItem(hMenu, MENU_RES_ARCADE, bVidArcaderes ? MF_CHECKED : MF_UNCHECKED); break; case 2: - var = (nVidBlitterOpt[nVidSelect] & 0xFF) + MENU_SOFT_STRETCH; - CheckMenuRadioItem(hMenu, MENU_SOFT_STRETCH, MENU_SOFT_STRETCH + 25, var, MF_BYCOMMAND); - CheckMenuItem(hMenu, MENU_SOFT_AUTOSIZE, (nVidBlitterOpt[nVidSelect] & 0x0100) ? MF_CHECKED : MF_UNCHECKED); + var = (nVidBlitterOpt[nVidSelect] & 0xFF) + MENU_SOFTFX_SOFT_STRETCH; + CheckMenuRadioItem(hMenu, MENU_SOFTFX_SOFT_STRETCH, MENU_SOFTFX_SOFT_STRETCH + 25, var, MF_BYCOMMAND); + CheckMenuItem(hMenu, MENU_SOFTFX_SOFT_AUTOSIZE, (nVidBlitterOpt[nVidSelect] & 0x0100) ? MF_CHECKED : MF_UNCHECKED); CheckMenuItem(hMenu, MENU_SOFT_DIRECTACCESS, !(nVidBlitterOpt[nVidSelect] & 0x0200) ? MF_CHECKED : MF_UNCHECKED); break; case 3: var = ((nVidBlitterOpt[nVidSelect] >> 24) & 0x03) + MENU_DX9_POINT; CheckMenuRadioItem(hMenu, MENU_DX9_POINT, MENU_DX9_POINT + 2, var, MF_BYCOMMAND); - CheckMenuItem(hMenu, MENU_SCAN, bVidScanlines ? MF_CHECKED : MF_UNCHECKED); + CheckMenuItem(hMenu, MENU_EXP_SCAN, bVidScanlines ? MF_CHECKED : MF_UNCHECKED); var = MENU_DX9_CUBIC_CUSTOM; if (dVidCubicB > -0.001 && dVidCubicB < 0.001 && dVidCubicC > -0.001 && dVidCubicC < 0.001) { @@ -748,9 +748,9 @@ void MenuUpdate() CheckMenuRadioItem(hMenu, MENU_DX9_CUBIC0, MENU_DX9_CUBIC0 + 8, var, MF_BYCOMMAND); break; case 4: - var = (nVidBlitterOpt[nVidSelect] & 0xFF) + MENU_SOFT_STRETCH; - CheckMenuRadioItem(hMenu, MENU_SOFT_STRETCH, MENU_SOFT_STRETCH + 25, var, MF_BYCOMMAND); - CheckMenuItem(hMenu, MENU_SOFT_AUTOSIZE, (nVidBlitterOpt[nVidSelect] & 0x0100) ? MF_CHECKED : MF_UNCHECKED); + var = (nVidBlitterOpt[nVidSelect] & 0xFF) + MENU_DX9_ALT_SOFT_STRETCH; + CheckMenuRadioItem(hMenu, MENU_DX9_ALT_SOFT_STRETCH, MENU_DX9_ALT_SOFT_STRETCH + 25, var, MF_BYCOMMAND); + CheckMenuItem(hMenu, MENU_DX9_ALT_SOFT_AUTOSIZE, (nVidBlitterOpt[nVidSelect] & 0x0100) ? MF_CHECKED : MF_UNCHECKED); CheckMenuRadioItem(hMenu, MENU_DX9_ALT_POINT, MENU_DX9_ALT_POINT + 1, MENU_DX9_ALT_POINT + bVidDX9Bilinear, MF_BYCOMMAND); CheckMenuItem(hMenu, MENU_DX9_ALT_HARDWAREVERTEX, (bVidHardwareVertex) ? MF_CHECKED : MF_UNCHECKED); CheckMenuItem(hMenu, MENU_DX9_ALT_MOTIONBLUR, (bVidMotionBlur) ? MF_CHECKED : MF_UNCHECKED); @@ -847,15 +847,27 @@ void MenuUpdate() CheckMenuItem(hMenu, MENU_AUTOSWITCHFULL, bVidAutoSwitchFull ? MF_CHECKED : MF_UNCHECKED); if (nVidTransferMethod == 0) { - var = MENU_VIDEOMEM; + var = MENU_BASIC_VIDEOMEM; } else { if (nVidTransferMethod == -1) { - var = MENU_MEMAUTO; + var = MENU_BASIC_MEMAUTO; } else { - var = MENU_SYSMEM; + var = MENU_BASIC_SYSMEM; } } - CheckMenuRadioItem(hMenu, MENU_MEMAUTO, MENU_SYSMEM, var, MF_BYCOMMAND); + CheckMenuRadioItem(hMenu, MENU_BASIC_MEMAUTO, MENU_BASIC_SYSMEM, var, MF_BYCOMMAND); + + if (nVidTransferMethod == 0) { + var = MENU_SOFTFX_VIDEOMEM; + } else { + if (nVidTransferMethod == -1) { + var = MENU_SOFTFX_MEMAUTO; + } else { + var = MENU_SOFTFX_SYSMEM; + } + } + CheckMenuRadioItem(hMenu, MENU_SOFTFX_MEMAUTO, MENU_SOFTFX_SYSMEM, var, MF_BYCOMMAND); + if (nWindowSize <= 4) { var = MENU_AUTOSIZE + nWindowSize; } else { diff --git a/src/burner/win32/numdial.cpp b/src/burner/win32/numdial.cpp index 94f7dc93e..364ee7548 100644 --- a/src/burner/win32/numdial.cpp +++ b/src/burner/win32/numdial.cpp @@ -5,8 +5,6 @@ const double PI = 3.14159265358979323846f; // Pi const double DEGTORAD = 0.01745329251994329547f; // Degrees to Radians const double RADTODEG = 57.29577951308232286465f; // Radians to Degrees -static TCHAR* frDial = _T("Number of Frames"); - static int nExitStatus; // ----------------------------------------------------------------------------- @@ -19,7 +17,7 @@ static INT_PTR CALLBACK DefInpProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM) switch (Msg) { case WM_INITDIALOG: nRet = nAudSegCount; - SetWindowText(hDlg, frDial); + SetWindowText(hDlg, FBALoadStringEx(hAppInst, IDS_NUMDIAL_NUM_FRAMES, true)); SetDlgItemInt(hDlg, IDC_VALUE_EDIT, nRet, TRUE); return TRUE; @@ -891,7 +889,7 @@ static INT_PTR CALLBACK CubicProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM) // _stprintf(szText, _T("%.3lf"), 1.0 - dVidCubicB); SendDlgItemMessage(hDlg, IDC_SCANLINE_EDIT, WM_SETTEXT, (WPARAM)0, (LPARAM)szText); - SetWindowText(hDlg, _T("Select desired filter sharpness")); + SetWindowText(hDlg, FBALoadStringEx(hAppInst, IDS_NUMDIAL_FILTER_SHARP, true)); // Update the screen if (bDrvOkay) { diff --git a/src/burner/win32/resource.h b/src/burner/win32/resource.h index 8c25a2a51..7d7f54eeb 100644 --- a/src/burner/win32/resource.h +++ b/src/burner/win32/resource.h @@ -191,6 +191,7 @@ #define IDC_SEL_IPSGROUP 20133 #define IDC_SEL_SEARCH 20134 #define IDC_SEL_SEARCHGROUP 20135 +#define IDC_RESOLUTION 20136 #define IDC_SUPPORTDIR_EDIT1 20150 #define IDC_SUPPORTDIR_EDIT2 20151 @@ -397,9 +398,12 @@ #define MENU_GAMMA_USE_HARDWARE 10154 #define MENU_GAMMA_HARDWARE_ONLY 10155 #define MENU_GAMMA_SOFTWARE_ONLY 10156 -#define MENU_MEMAUTO 10160 -#define MENU_VIDEOMEM 10161 -#define MENU_SYSMEM 10162 +#define MENU_BASIC_MEMAUTO 10160 +#define MENU_BASIC_VIDEOMEM 10161 +#define MENU_BASIC_SYSMEM 10162 +#define MENU_SOFTFX_MEMAUTO 10163 +#define MENU_SOFTFX_VIDEOMEM 10164 +#define MENU_SOFTFX_SYSMEM 10165 #define MENU_AUTOSIZE 10170 #define MENU_SINGLESIZEWINDOW 10171 #define MENU_DOUBLESIZEWINDOW 10172 @@ -466,9 +470,8 @@ #define MENU_SYSINFO 10502 #define MENU_CONTENTS 10503 #define MENU_WWW_HOME 10504 -#define MENU_WWW_FORUM 10505 -#define MENU_WHATSNEW 10506 -#define MENU_WWW_NSFORUM 10507 +#define MENU_WHATSNEW 10505 +#define MENU_WWW_NSFORUM 10506 #define MENU_WLOGSTART 10606 #define MENU_WLOGEND 10607 #define MENU_AUTOSWITCHFULL 10613 @@ -532,22 +535,26 @@ #define MENU_START_NEOGEO_CD 10712 #define MENU_LOAD_NEOCD 10713 -#define MENU_NORMAL 11001 -#define MENU_SCAN 11002 +#define MENU_BASIC_NORMAL 11001 +#define MENU_BASIC_SCAN 11002 #define MENU_SCAN50 11003 +#define MENU_ENHANCED_NORMAL 11004 +#define MENU_ENHANCED_SCAN 11005 +#define MENU_EXP_SCAN 11010 #define MENU_DISABLEFX 11101 #define MENU_BILINEAR 11102 #define MENU_PHOSPHOR 11103 #define MENU_RGBEFFECTS 11104 #define MENU_3DPROJECTION 11105 -#define MENU_ROTSCAN 11106 +#define MENU_BASIC_ROTSCAN 11106 #define MENU_PRESCALE 11107 #define MENU_SOFTFX 11108 -#define MENU_SCANINTENSITY 11109 +#define MENU_ENHANCED_SCANINTENSITY 11109 #define MENU_PHOSPHORINTENSITY 11110 #define MENU_3DSCREENANGLE 11111 #define MENU_3DUSELIGHTING 11112 +#define MENU_ENHANCED_ROTSCAN 11113 #define MENU_EFFECT_AUTO 11121 #define MENU_EFFECT_01 11122 #define MENU_EFFECT_02 11123 @@ -568,60 +575,115 @@ #define MENU_FORCE_16BIT 11141 #define MENU_TEXTUREMANAGE 11142 #define MENU_FORCE_FLIP 11143 +#define MENU_EXP_SCANINTENSITY 11144 -#define MENU_SOFT_STRETCH 11201 -#define MENU_SOFT_SCALE2X 11202 -#define MENU_SOFT_SCALE3X 11203 -#define MENU_SOFT_2XPM_LQ 11204 -#define MENU_SOFT_2XPM_HQ 11205 -#define MENU_SOFT_EAGLE 11206 -#define MENU_SOFT_SUPEREAGLE 11207 -#define MENU_SOFT_2XSAI 11208 -#define MENU_SOFT_SUPER2XSAI 11209 -#define MENU_SOFT_SUPEREAGLE_VBA 11210 -#define MENU_SOFT_2XSAI_VBA 11211 -#define MENU_SOFT_SUPER2XSAI_VBA 11212 -#define MENU_SOFT_SUPERSCALE 11213 -#define MENU_SOFT_SUPERSCALE75 11214 -#define MENU_SOFT_HQ2X 11215 -#define MENU_SOFT_HQ3X 11216 -#define MENU_SOFT_HQ4X 11217 -#define MENU_SOFT_HQ2XS_VBA 11218 -#define MENU_SOFT_HQ3XS_VBA 11219 -#define MENU_SOFT_HQ2XS_SNES9X 11220 -#define MENU_SOFT_HQ3XS_SNES9X 11221 -#define MENU_SOFT_HQ2XBOLD 11222 -#define MENU_SOFT_HQ3XBOLD 11223 -#define MENU_SOFT_EPXB 11224 -#define MENU_SOFT_EPXC 11225 -#define MENU_SOFT_AUTOSIZE 11290 -#define MENU_SOFT_DIRECTACCESS 11291 +#define MENU_ENHANCED_SOFT_STRETCH 11201 +#define MENU_ENHANCED_SOFT_SCALE2X 11202 +#define MENU_ENHANCED_SOFT_SCALE3X 11203 +#define MENU_ENHANCED_SOFT_2XPM_LQ 11204 +#define MENU_ENHANCED_SOFT_2XPM_HQ 11205 +#define MENU_ENHANCED_SOFT_EAGLE 11206 +#define MENU_ENHANCED_SOFT_SUPEREAGLE 11207 +#define MENU_ENHANCED_SOFT_2XSAI 11208 +#define MENU_ENHANCED_SOFT_SUPER2XSAI 11209 +#define MENU_ENHANCED_SOFT_SUPEREAGLE_VBA 11210 +#define MENU_ENHANCED_SOFT_2XSAI_VBA 11211 +#define MENU_ENHANCED_SOFT_SUPER2XSAI_VBA 11212 +#define MENU_ENHANCED_SOFT_SUPERSCALE 11213 +#define MENU_ENHANCED_SOFT_SUPERSCALE75 11214 +#define MENU_ENHANCED_SOFT_HQ2X 11215 +#define MENU_ENHANCED_SOFT_HQ3X 11216 +#define MENU_ENHANCED_SOFT_HQ4X 11217 +#define MENU_ENHANCED_SOFT_HQ2XS_VBA 11218 +#define MENU_ENHANCED_SOFT_HQ3XS_VBA 11219 +#define MENU_ENHANCED_SOFT_HQ2XS_SNES9X 11220 +#define MENU_ENHANCED_SOFT_HQ3XS_SNES9X 11221 +#define MENU_ENHANCED_SOFT_HQ2XBOLD 11222 +#define MENU_ENHANCED_SOFT_HQ3XBOLD 11223 +#define MENU_ENHANCED_SOFT_EPXB 11224 +#define MENU_ENHANCED_SOFT_EPXC 11225 +#define MENU_ENHANCED_SOFT_AUTOSIZE 11290 -#define MENU_DX9_POINT 11301 -#define MENU_DX9_LINEAR 11302 -#define MENU_DX9_CUBIC 11303 -#define MENU_DX9_CUBIC_LIGHT 11310 -#define MENU_DX9_CUBIC_BSPLINE 11311 -#define MENU_DX9_CUBIC_NOTCH 11312 -#define MENU_DX9_CUBIC_OPTIMAL 11313 -#define MENU_DX9_CUBIC_CATMULL 11314 -#define MENU_DX9_CUBIC_SHARP 11315 -#define MENU_DX9_CUBIC_DUFF 11316 -#define MENU_DX9_CUBIC_MITCHELL 11317 -#define MENU_DX9_CUBIC_CARDINAL 11318 -#define MENU_DX9_CUBIC_CUSTOM 11319 -#define MENU_DX9_FPTERXTURES 11320 -#define MENU_DX9_FORCE_PS14 11321 -#define MENU_DX9_CUBIC0 11322 -#define MENU_DX9_CUBIC1 11323 -#define MENU_DX9_CUBIC2 11324 -#define MENU_DX9_CUBIC3 11325 -#define MENU_DX9_CUBIC4 11326 +#define MENU_SOFTFX_SOFT_STRETCH 11301 +#define MENU_SOFTFX_SOFT_SCALE2X 11302 +#define MENU_SOFTFX_SOFT_SCALE3X 11303 +#define MENU_SOFTFX_SOFT_2XPM_LQ 11304 +#define MENU_SOFTFX_SOFT_2XPM_HQ 11305 +#define MENU_SOFTFX_SOFT_EAGLE 11306 +#define MENU_SOFTFX_SOFT_SUPEREAGLE 11307 +#define MENU_SOFTFX_SOFT_2XSAI 11308 +#define MENU_SOFTFX_SOFT_SUPER2XSAI 11309 +#define MENU_SOFTFX_SOFT_SUPEREAGLE_VBA 11310 +#define MENU_SOFTFX_SOFT_2XSAI_VBA 11311 +#define MENU_SOFTFX_SOFT_SUPER2XSAI_VBA 11312 +#define MENU_SOFTFX_SOFT_SUPERSCALE 11313 +#define MENU_SOFTFX_SOFT_SUPERSCALE75 11314 +#define MENU_SOFTFX_SOFT_HQ2X 11315 +#define MENU_SOFTFX_SOFT_HQ3X 11316 +#define MENU_SOFTFX_SOFT_HQ4X 11317 +#define MENU_SOFTFX_SOFT_HQ2XS_VBA 11318 +#define MENU_SOFTFX_SOFT_HQ3XS_VBA 11319 +#define MENU_SOFTFX_SOFT_HQ2XS_SNES9X 11320 +#define MENU_SOFTFX_SOFT_HQ3XS_SNES9X 11321 +#define MENU_SOFTFX_SOFT_HQ2XBOLD 11322 +#define MENU_SOFTFX_SOFT_HQ3XBOLD 11323 +#define MENU_SOFTFX_SOFT_EPXB 11324 +#define MENU_SOFTFX_SOFT_EPXC 11325 +#define MENU_SOFTFX_SOFT_AUTOSIZE 11390 +#define MENU_SOFT_DIRECTACCESS 11391 -#define MENU_DX9_ALT_POINT 11401 -#define MENU_DX9_ALT_LINEAR 11402 -#define MENU_DX9_ALT_HARDWAREVERTEX 11403 -#define MENU_DX9_ALT_MOTIONBLUR 11404 +#define MENU_DX9_ALT_SOFT_STRETCH 11401 +#define MENU_DX9_ALT_SOFT_SCALE2X 11402 +#define MENU_DX9_ALT_SOFT_SCALE3X 11403 +#define MENU_DX9_ALT_SOFT_2XPM_LQ 11404 +#define MENU_DX9_ALT_SOFT_2XPM_HQ 11405 +#define MENU_DX9_ALT_SOFT_EAGLE 11406 +#define MENU_DX9_ALT_SOFT_SUPEREAGLE 11407 +#define MENU_DX9_ALT_SOFT_2XSAI 11408 +#define MENU_DX9_ALT_SOFT_SUPER2XSAI 11409 +#define MENU_DX9_ALT_SOFT_SUPEREAGLE_VBA 11410 +#define MENU_DX9_ALT_SOFT_2XSAI_VBA 11411 +#define MENU_DX9_ALT_SOFT_SUPER2XSAI_VBA 11412 +#define MENU_DX9_ALT_SOFT_SUPERSCALE 11413 +#define MENU_DX9_ALT_SOFT_SUPERSCALE75 11414 +#define MENU_DX9_ALT_SOFT_HQ2X 11415 +#define MENU_DX9_ALT_SOFT_HQ3X 11416 +#define MENU_DX9_ALT_SOFT_HQ4X 11417 +#define MENU_DX9_ALT_SOFT_HQ2XS_VBA 11418 +#define MENU_DX9_ALT_SOFT_HQ3XS_VBA 11419 +#define MENU_DX9_ALT_SOFT_HQ2XS_SNES9X 11420 +#define MENU_DX9_ALT_SOFT_HQ3XS_SNES9X 11421 +#define MENU_DX9_ALT_SOFT_HQ2XBOLD 11422 +#define MENU_DX9_ALT_SOFT_HQ3XBOLD 11423 +#define MENU_DX9_ALT_SOFT_EPXB 11424 +#define MENU_DX9_ALT_SOFT_EPXC 11425 +#define MENU_DX9_ALT_SOFT_AUTOSIZE 11490 + +#define MENU_DX9_POINT 11601 +#define MENU_DX9_LINEAR 11602 +#define MENU_DX9_CUBIC 11603 +#define MENU_DX9_CUBIC_LIGHT 11610 +#define MENU_DX9_CUBIC_BSPLINE 11611 +#define MENU_DX9_CUBIC_NOTCH 11612 +#define MENU_DX9_CUBIC_OPTIMAL 11613 +#define MENU_DX9_CUBIC_CATMULL 11614 +#define MENU_DX9_CUBIC_SHARP 11615 +#define MENU_DX9_CUBIC_DUFF 11616 +#define MENU_DX9_CUBIC_MITCHELL 11617 +#define MENU_DX9_CUBIC_CARDINAL 11618 +#define MENU_DX9_CUBIC_CUSTOM 11619 +#define MENU_DX9_FPTERXTURES 11620 +#define MENU_DX9_FORCE_PS14 11621 +#define MENU_DX9_CUBIC0 11622 +#define MENU_DX9_CUBIC1 11623 +#define MENU_DX9_CUBIC2 11624 +#define MENU_DX9_CUBIC3 11625 +#define MENU_DX9_CUBIC4 11626 + +#define MENU_DX9_ALT_POINT 11701 +#define MENU_DX9_ALT_LINEAR 11702 +#define MENU_DX9_ALT_HARDWAREVERTEX 11703 +#define MENU_DX9_ALT_MOTIONBLUR 11704 // Next default values for new objects // diff --git a/src/burner/win32/resource_string.h b/src/burner/win32/resource_string.h index 66d0ffcb9..11ff25d9f 100644 --- a/src/burner/win32/resource_string.h +++ b/src/burner/win32/resource_string.h @@ -122,6 +122,8 @@ #define IDS_PRESET_SAVED (IDS_STRING + 520) #define IDS_CD_SELECT_IMAGE (IDS_STRING + 540) +#define IDS_CD_SELECT_IMAGE_TITLE (IDS_STRING + 542) +#define IDS_CD_SELECT_FILTER (IDS_STRING + 544) #define IDS_SEL_FILTERS (IDS_STRING + 560) #define IDS_SEL_HARDWARE (IDS_STRING + 562) @@ -199,6 +201,14 @@ #define IDS_MENU_5 (IDS_STRING + 850) #define IDS_MENU_6 (IDS_STRING + 852) +#define IDS_NUMDIAL_NUM_FRAMES (IDS_STRING + 870) +#define IDS_NUMDIAL_FILTER_SHARP (IDS_STRING + 872) + +#define IDS_CHEAT_SEARCH_NEW (IDS_STRING + 880) +#define IDS_CHEAT_SEARCH_ADD_MATCH (IDS_STRING + 882) +#define IDS_CHEAT_SEARCH_RESULTS (IDS_STRING + 884) +#define IDS_CHEAT_SEARCH_EXIT (IDS_STRING + 886) + #define IDS_LANG_ENGLISH_US (IDS_STRING + 900) #define IDS_LANG_SIMP_CHINESE (IDS_STRING + 902) #define IDS_LANG_TRAD_CHINESE (IDS_STRING + 904) diff --git a/src/burner/win32/scrn.cpp b/src/burner/win32/scrn.cpp index 2cf6a0353..86731e1b2 100644 --- a/src/burner/win32/scrn.cpp +++ b/src/burner/win32/scrn.cpp @@ -840,7 +840,9 @@ static void OnCommand(HWND /*hDlg*/, int id, HWND /*hwndCtl*/, UINT codeNotify) ofn.hwndOwner = hScrnWnd; ofn.lpstrFile = CDEmuImage; ofn.nMaxFile = sizeof(CDEmuImage); - ofn.lpstrTitle = _T("Select CD Image"); + TCHAR szTitle[100]; + _stprintf(szTitle, FBALoadStringEx(hAppInst, IDS_CD_SELECT_IMAGE_TITLE, true)); + ofn.lpstrTitle = szTitle; ofn.lpstrFilter = _T("CD images (*.iso,*.cue)\0*.iso;*.cue\0\0)"); ofn.lpstrInitialDir = _T("."); ofn.Flags = OFN_NOCHANGEDIR | OFN_HIDEREADONLY; @@ -1484,17 +1486,20 @@ static void OnCommand(HWND /*hDlg*/, int id, HWND /*hwndCtl*/, UINT codeNotify) bVidAutoSwitchFull = !bVidAutoSwitchFull; break; - case MENU_MEMAUTO: + case MENU_BASIC_MEMAUTO: + case MENU_SOFTFX_MEMAUTO: nVidTransferMethod = -1; POST_INITIALISE_MESSAGE; break; - case MENU_VIDEOMEM: + case MENU_BASIC_VIDEOMEM: + case MENU_SOFTFX_VIDEOMEM: nVidTransferMethod = 0; POST_INITIALISE_MESSAGE; break; - case MENU_SYSMEM: + case MENU_BASIC_SYSMEM: + case MENU_SOFTFX_SYSMEM: nVidTransferMethod = 1; POST_INITIALISE_MESSAGE; break; @@ -1844,7 +1849,11 @@ static void OnCommand(HWND /*hDlg*/, int id, HWND /*hwndCtl*/, UINT codeNotify) case MENU_CHEATSEARCH_START: { CheatSearchStart(); - VidSAddChatMsg(NULL, 0xFFFFFF, _T("New cheat search started"), 0xFFBFBF); + + TCHAR szText[100]; + _stprintf(szText, FBALoadStringEx(hAppInst, IDS_CHEAT_SEARCH_NEW, true)); + VidSAddChatMsg(NULL, 0xFFFFFF, szText, 0xFFBFBF); + EnableMenuItem(hMenu, MENU_CHEATSEARCH_NOCHANGE, MF_ENABLED | MF_BYCOMMAND); EnableMenuItem(hMenu, MENU_CHEATSEARCH_CHANGE, MF_ENABLED | MF_BYCOMMAND); EnableMenuItem(hMenu, MENU_CHEATSEARCH_DECREASE, MF_ENABLED | MF_BYCOMMAND); @@ -1858,12 +1867,12 @@ static void OnCommand(HWND /*hDlg*/, int id, HWND /*hwndCtl*/, UINT codeNotify) TCHAR tmpmsg[256]; unsigned int nValues = CheatSearchValueNoChange(); - _sntprintf(tmpmsg, 256, _T("%i Addresses Matched"), nValues); + _stprintf(tmpmsg, FBALoadStringEx(hAppInst, IDS_CHEAT_SEARCH_ADD_MATCH, true), nValues); VidSAddChatMsg(NULL, 0xFFFFFF, tmpmsg, 0xFFBFBF); if (nValues <= CHEATSEARCH_SHOWRESULTS) { for (unsigned int i = 0; i < nValues; i++) { - _sntprintf(tmpmsg, 256, _T("Address %08X Value %02X"), CheatSearchShowResultAddresses[i], CheatSearchShowResultValues[i]); + _stprintf(tmpmsg, FBALoadStringEx(hAppInst, IDS_CHEAT_SEARCH_RESULTS, true), CheatSearchShowResultAddresses[i], CheatSearchShowResultValues[i]); VidSAddChatMsg(NULL, 0xFFFFFF, tmpmsg, 0xFFBFBF); } } @@ -1874,12 +1883,12 @@ static void OnCommand(HWND /*hDlg*/, int id, HWND /*hwndCtl*/, UINT codeNotify) TCHAR tmpmsg[256]; unsigned int nValues = CheatSearchValueChange(); - _sntprintf(tmpmsg, 256, _T("%i Addresses Matched"), nValues); + _stprintf(tmpmsg, FBALoadStringEx(hAppInst, IDS_CHEAT_SEARCH_ADD_MATCH, true), nValues); VidSAddChatMsg(NULL, 0xFFFFFF, tmpmsg, 0xFFBFBF); if (nValues <= CHEATSEARCH_SHOWRESULTS) { for (unsigned int i = 0; i < nValues; i++) { - _sntprintf(tmpmsg, 256, _T("Address %08X Value %02X"), CheatSearchShowResultAddresses[i], CheatSearchShowResultValues[i]); + _stprintf(tmpmsg, FBALoadStringEx(hAppInst, IDS_CHEAT_SEARCH_RESULTS, true), CheatSearchShowResultAddresses[i], CheatSearchShowResultValues[i]); VidSAddChatMsg(NULL, 0xFFFFFF, tmpmsg, 0xFFBFBF); } } @@ -1890,12 +1899,12 @@ static void OnCommand(HWND /*hDlg*/, int id, HWND /*hwndCtl*/, UINT codeNotify) TCHAR tmpmsg[256]; unsigned int nValues = CheatSearchValueDecreased(); - _sntprintf(tmpmsg, 256, _T("%i Addresses Matched"), nValues); + _stprintf(tmpmsg, FBALoadStringEx(hAppInst, IDS_CHEAT_SEARCH_ADD_MATCH, true), nValues); VidSAddChatMsg(NULL, 0xFFFFFF, tmpmsg, 0xFFBFBF); if (nValues <= CHEATSEARCH_SHOWRESULTS) { for (unsigned int i = 0; i < nValues; i++) { - _sntprintf(tmpmsg, 256, _T("Address %08X Value %02X"), CheatSearchShowResultAddresses[i], CheatSearchShowResultValues[i]); + _stprintf(tmpmsg, FBALoadStringEx(hAppInst, IDS_CHEAT_SEARCH_RESULTS, true), CheatSearchShowResultAddresses[i], CheatSearchShowResultValues[i]); VidSAddChatMsg(NULL, 0xFFFFFF, tmpmsg, 0xFFBFBF); } } @@ -1907,12 +1916,12 @@ static void OnCommand(HWND /*hDlg*/, int id, HWND /*hwndCtl*/, UINT codeNotify) unsigned int nValues = CheatSearchValueIncreased(); - _sntprintf(tmpmsg, 256, _T("%i Addresses Matched"), nValues); + _stprintf(tmpmsg, FBALoadStringEx(hAppInst, IDS_CHEAT_SEARCH_ADD_MATCH, true), nValues); VidSAddChatMsg(NULL, 0xFFFFFF, tmpmsg, 0xFFBFBF); if (nValues <= CHEATSEARCH_SHOWRESULTS) { for (unsigned int i = 0; i < nValues; i++) { - _sntprintf(tmpmsg, 256, _T("Address %08X Value %02X"), CheatSearchShowResultAddresses[i], CheatSearchShowResultValues[i]); + _stprintf(tmpmsg, FBALoadStringEx(hAppInst, IDS_CHEAT_SEARCH_RESULTS, true), CheatSearchShowResultAddresses[i], CheatSearchShowResultValues[i]); VidSAddChatMsg(NULL, 0xFFFFFF, tmpmsg, 0xFFBFBF); } } @@ -1926,7 +1935,11 @@ static void OnCommand(HWND /*hDlg*/, int id, HWND /*hwndCtl*/, UINT codeNotify) case MENU_CHEATSEARCH_EXIT: { CheatSearchExit(); - VidSAddChatMsg(NULL, 0xFFFFFF, _T("Cheat search exited"), 0xFFBFBF); + + TCHAR szText[100]; + _stprintf(szText, FBALoadStringEx(hAppInst, IDS_CHEAT_SEARCH_EXIT, true)); + VidSAddChatMsg(NULL, 0xFFFFFF, szText, 0xFFBFBF); + EnableMenuItem(hMenu, MENU_CHEATSEARCH_NOCHANGE, MF_GRAYED | MF_BYCOMMAND); EnableMenuItem(hMenu, MENU_CHEATSEARCH_CHANGE, MF_GRAYED | MF_BYCOMMAND); EnableMenuItem(hMenu, MENU_CHEATSEARCH_DECREASE, MF_GRAYED | MF_BYCOMMAND); @@ -2005,12 +2018,6 @@ static void OnCommand(HWND /*hDlg*/, int id, HWND /*hwndCtl*/, UINT codeNotify) } break; - case MENU_WWW_FORUM: - if (!nVidFullscreen) { - ShellExecute(NULL, _T("open"), _T("http://www.ojko.com/phpbb/viewforum.php?f=27"), NULL, NULL, SW_SHOWNORMAL); - } - break; - case MENU_WWW_NSFORUM: if (!nVidFullscreen) { ShellExecute(NULL, _T("open"), _T("http://neosource.1emu.net/forums/"), NULL, NULL, SW_SHOWNORMAL); @@ -2026,11 +2033,11 @@ static void OnCommand(HWND /*hDlg*/, int id, HWND /*hwndCtl*/, UINT codeNotify) case 0: { switch (id) { // Options for the Default DirectDraw blitter - case MENU_NORMAL: + case MENU_BASIC_NORMAL: bVidScanlines = 0; POST_INITIALISE_MESSAGE; break; - case MENU_SCAN: + case MENU_BASIC_SCAN: bVidScanlines = 1; bVidScanHalf = 0; POST_INITIALISE_MESSAGE; @@ -2041,7 +2048,7 @@ static void OnCommand(HWND /*hDlg*/, int id, HWND /*hwndCtl*/, UINT codeNotify) POST_INITIALISE_MESSAGE; break; - case MENU_ROTSCAN: + case MENU_BASIC_ROTSCAN: bVidScanRotate = !bVidScanRotate; POST_INITIALISE_MESSAGE; break; @@ -2074,11 +2081,11 @@ static void OnCommand(HWND /*hDlg*/, int id, HWND /*hwndCtl*/, UINT codeNotify) bVidScanDelay = !bVidScanDelay; break; - case MENU_NORMAL: + case MENU_ENHANCED_NORMAL: nVidBlitterOpt[nVidSelect] &= ~0x00110000; POST_INITIALISE_MESSAGE; break; - case MENU_SCAN: + case MENU_ENHANCED_SCAN: bVidScanlines = !bVidScanlines; nVidBlitterOpt[nVidSelect] &= ~0x00010000; POST_INITIALISE_MESSAGE; @@ -2135,7 +2142,7 @@ static void OnCommand(HWND /*hDlg*/, int id, HWND /*hwndCtl*/, UINT codeNotify) } break; - case MENU_ROTSCAN: + case MENU_ENHANCED_ROTSCAN: bVidScanRotate = !bVidScanRotate; POST_INITIALISE_MESSAGE; break; @@ -2150,42 +2157,42 @@ static void OnCommand(HWND /*hDlg*/, int id, HWND /*hwndCtl*/, UINT codeNotify) POST_INITIALISE_MESSAGE; break; - case MENU_SOFT_STRETCH: - case MENU_SOFT_SCALE2X: - case MENU_SOFT_SCALE3X: - case MENU_SOFT_2XPM_LQ: - case MENU_SOFT_2XPM_HQ: - case MENU_SOFT_EAGLE: - case MENU_SOFT_SUPEREAGLE: - case MENU_SOFT_2XSAI: - case MENU_SOFT_SUPER2XSAI: - case MENU_SOFT_SUPEREAGLE_VBA: - case MENU_SOFT_2XSAI_VBA: - case MENU_SOFT_SUPER2XSAI_VBA: - case MENU_SOFT_SUPERSCALE: - case MENU_SOFT_SUPERSCALE75: - case MENU_SOFT_HQ2X: - case MENU_SOFT_HQ3X: - case MENU_SOFT_HQ4X: - case MENU_SOFT_HQ2XS_VBA: - case MENU_SOFT_HQ3XS_VBA: - case MENU_SOFT_HQ2XS_SNES9X: - case MENU_SOFT_HQ3XS_SNES9X: - case MENU_SOFT_HQ2XBOLD: - case MENU_SOFT_HQ3XBOLD: - case MENU_SOFT_EPXB: - case MENU_SOFT_EPXC: { + case MENU_ENHANCED_SOFT_STRETCH: + case MENU_ENHANCED_SOFT_SCALE2X: + case MENU_ENHANCED_SOFT_SCALE3X: + case MENU_ENHANCED_SOFT_2XPM_LQ: + case MENU_ENHANCED_SOFT_2XPM_HQ: + case MENU_ENHANCED_SOFT_EAGLE: + case MENU_ENHANCED_SOFT_SUPEREAGLE: + case MENU_ENHANCED_SOFT_2XSAI: + case MENU_ENHANCED_SOFT_SUPER2XSAI: + case MENU_ENHANCED_SOFT_SUPEREAGLE_VBA: + case MENU_ENHANCED_SOFT_2XSAI_VBA: + case MENU_ENHANCED_SOFT_SUPER2XSAI_VBA: + case MENU_ENHANCED_SOFT_SUPERSCALE: + case MENU_ENHANCED_SOFT_SUPERSCALE75: + case MENU_ENHANCED_SOFT_HQ2X: + case MENU_ENHANCED_SOFT_HQ3X: + case MENU_ENHANCED_SOFT_HQ4X: + case MENU_ENHANCED_SOFT_HQ2XS_VBA: + case MENU_ENHANCED_SOFT_HQ3XS_VBA: + case MENU_ENHANCED_SOFT_HQ2XS_SNES9X: + case MENU_ENHANCED_SOFT_HQ3XS_SNES9X: + case MENU_ENHANCED_SOFT_HQ2XBOLD: + case MENU_ENHANCED_SOFT_HQ3XBOLD: + case MENU_ENHANCED_SOFT_EPXB: + case MENU_ENHANCED_SOFT_EPXC: { nVidBlitterOpt[nVidSelect] &= 0x0FFFFFFF; - nVidBlitterOpt[nVidSelect] |= 0x03000000 + ((long long)(id - MENU_SOFT_STRETCH) << 32); + nVidBlitterOpt[nVidSelect] |= 0x03000000 + ((long long)(id - MENU_ENHANCED_SOFT_STRETCH) << 32); POST_INITIALISE_MESSAGE; break; } - case MENU_SOFT_AUTOSIZE: + case MENU_ENHANCED_SOFT_AUTOSIZE: nVidBlitterOpt[nVidSelect] ^= 0x04000000; POST_INITIALISE_MESSAGE; break; - case MENU_SCANINTENSITY: + case MENU_ENHANCED_SCANINTENSITY: if (UseDialogs()) { InputSetCooperativeLevel(false, bAlwaysProcessKeyboardInput); AudBlankSound(); @@ -2257,37 +2264,37 @@ static void OnCommand(HWND /*hDlg*/, int id, HWND /*hwndCtl*/, UINT codeNotify) case 2: { switch (id) { // Options for the DirectDraw Software Effects blitter - case MENU_SOFT_STRETCH: - case MENU_SOFT_SCALE2X: - case MENU_SOFT_SCALE3X: - case MENU_SOFT_2XPM_LQ: - case MENU_SOFT_2XPM_HQ: - case MENU_SOFT_EAGLE: - case MENU_SOFT_SUPEREAGLE: - case MENU_SOFT_2XSAI: - case MENU_SOFT_SUPER2XSAI: - case MENU_SOFT_SUPEREAGLE_VBA: - case MENU_SOFT_2XSAI_VBA: - case MENU_SOFT_SUPER2XSAI_VBA: - case MENU_SOFT_SUPERSCALE: - case MENU_SOFT_SUPERSCALE75: - case MENU_SOFT_HQ2X: - case MENU_SOFT_HQ3X: - case MENU_SOFT_HQ4X: - case MENU_SOFT_HQ2XS_VBA: - case MENU_SOFT_HQ3XS_VBA: - case MENU_SOFT_HQ2XS_SNES9X: - case MENU_SOFT_HQ3XS_SNES9X: - case MENU_SOFT_HQ2XBOLD: - case MENU_SOFT_HQ3XBOLD: - case MENU_SOFT_EPXB: - case MENU_SOFT_EPXC: + case MENU_SOFTFX_SOFT_STRETCH: + case MENU_SOFTFX_SOFT_SCALE2X: + case MENU_SOFTFX_SOFT_SCALE3X: + case MENU_SOFTFX_SOFT_2XPM_LQ: + case MENU_SOFTFX_SOFT_2XPM_HQ: + case MENU_SOFTFX_SOFT_EAGLE: + case MENU_SOFTFX_SOFT_SUPEREAGLE: + case MENU_SOFTFX_SOFT_2XSAI: + case MENU_SOFTFX_SOFT_SUPER2XSAI: + case MENU_SOFTFX_SOFT_SUPEREAGLE_VBA: + case MENU_SOFTFX_SOFT_2XSAI_VBA: + case MENU_SOFTFX_SOFT_SUPER2XSAI_VBA: + case MENU_SOFTFX_SOFT_SUPERSCALE: + case MENU_SOFTFX_SOFT_SUPERSCALE75: + case MENU_SOFTFX_SOFT_HQ2X: + case MENU_SOFTFX_SOFT_HQ3X: + case MENU_SOFTFX_SOFT_HQ4X: + case MENU_SOFTFX_SOFT_HQ2XS_VBA: + case MENU_SOFTFX_SOFT_HQ3XS_VBA: + case MENU_SOFTFX_SOFT_HQ2XS_SNES9X: + case MENU_SOFTFX_SOFT_HQ3XS_SNES9X: + case MENU_SOFTFX_SOFT_HQ2XBOLD: + case MENU_SOFTFX_SOFT_HQ3XBOLD: + case MENU_SOFTFX_SOFT_EPXB: + case MENU_SOFTFX_SOFT_EPXC: nVidBlitterOpt[nVidSelect] &= ~0xFF; - nVidBlitterOpt[nVidSelect] |= id - MENU_SOFT_STRETCH; + nVidBlitterOpt[nVidSelect] |= id - MENU_SOFTFX_SOFT_STRETCH; POST_INITIALISE_MESSAGE; break; - case MENU_SOFT_AUTOSIZE: + case MENU_SOFTFX_SOFT_AUTOSIZE: nVidBlitterOpt[nVidSelect] ^= 0x0100; POST_INITIALISE_MESSAGE; break; @@ -2365,11 +2372,11 @@ static void OnCommand(HWND /*hDlg*/, int id, HWND /*hwndCtl*/, UINT codeNotify) break; */ - case MENU_SCAN: + case MENU_EXP_SCAN: bVidScanlines = !bVidScanlines; POST_INITIALISE_MESSAGE; break; - case MENU_SCANINTENSITY: + case MENU_EXP_SCANINTENSITY: if (UseDialogs()) { InputSetCooperativeLevel(false, bAlwaysProcessKeyboardInput); AudBlankSound(); @@ -2449,37 +2456,37 @@ static void OnCommand(HWND /*hDlg*/, int id, HWND /*hwndCtl*/, UINT codeNotify) POST_INITIALISE_MESSAGE; break; - case MENU_SOFT_STRETCH: - case MENU_SOFT_SCALE2X: - case MENU_SOFT_SCALE3X: - case MENU_SOFT_2XPM_LQ: - case MENU_SOFT_2XPM_HQ: - case MENU_SOFT_EAGLE: - case MENU_SOFT_SUPEREAGLE: - case MENU_SOFT_2XSAI: - case MENU_SOFT_SUPER2XSAI: - case MENU_SOFT_SUPEREAGLE_VBA: - case MENU_SOFT_2XSAI_VBA: - case MENU_SOFT_SUPER2XSAI_VBA: - case MENU_SOFT_SUPERSCALE: - case MENU_SOFT_SUPERSCALE75: - case MENU_SOFT_HQ2X: - case MENU_SOFT_HQ3X: - case MENU_SOFT_HQ4X: - case MENU_SOFT_HQ2XS_VBA: - case MENU_SOFT_HQ3XS_VBA: - case MENU_SOFT_HQ2XS_SNES9X: - case MENU_SOFT_HQ3XS_SNES9X: - case MENU_SOFT_HQ2XBOLD: - case MENU_SOFT_HQ3XBOLD: - case MENU_SOFT_EPXB: - case MENU_SOFT_EPXC: + case MENU_DX9_ALT_SOFT_STRETCH: + case MENU_DX9_ALT_SOFT_SCALE2X: + case MENU_DX9_ALT_SOFT_SCALE3X: + case MENU_DX9_ALT_SOFT_2XPM_LQ: + case MENU_DX9_ALT_SOFT_2XPM_HQ: + case MENU_DX9_ALT_SOFT_EAGLE: + case MENU_DX9_ALT_SOFT_SUPEREAGLE: + case MENU_DX9_ALT_SOFT_2XSAI: + case MENU_DX9_ALT_SOFT_SUPER2XSAI: + case MENU_DX9_ALT_SOFT_SUPEREAGLE_VBA: + case MENU_DX9_ALT_SOFT_2XSAI_VBA: + case MENU_DX9_ALT_SOFT_SUPER2XSAI_VBA: + case MENU_DX9_ALT_SOFT_SUPERSCALE: + case MENU_DX9_ALT_SOFT_SUPERSCALE75: + case MENU_DX9_ALT_SOFT_HQ2X: + case MENU_DX9_ALT_SOFT_HQ3X: + case MENU_DX9_ALT_SOFT_HQ4X: + case MENU_DX9_ALT_SOFT_HQ2XS_VBA: + case MENU_DX9_ALT_SOFT_HQ3XS_VBA: + case MENU_DX9_ALT_SOFT_HQ2XS_SNES9X: + case MENU_DX9_ALT_SOFT_HQ3XS_SNES9X: + case MENU_DX9_ALT_SOFT_HQ2XBOLD: + case MENU_DX9_ALT_SOFT_HQ3XBOLD: + case MENU_DX9_ALT_SOFT_EPXB: + case MENU_DX9_ALT_SOFT_EPXC: nVidBlitterOpt[nVidSelect] &= ~0xFF; - nVidBlitterOpt[nVidSelect] |= id - MENU_SOFT_STRETCH; + nVidBlitterOpt[nVidSelect] |= id - MENU_DX9_ALT_SOFT_STRETCH; POST_INITIALISE_MESSAGE; break; - case MENU_SOFT_AUTOSIZE: + case MENU_DX9_ALT_SOFT_AUTOSIZE: nVidBlitterOpt[nVidSelect] ^= 0x0100; POST_INITIALISE_MESSAGE; break; diff --git a/src/burner/win32/string.rc b/src/burner/win32/string.rc index 63450f515..a5e7ff1d1 100644 --- a/src/burner/win32/string.rc +++ b/src/burner/win32/string.rc @@ -122,6 +122,8 @@ BEGIN IDS_PRESET_SAVED "The preset file was saved to %s." IDS_CD_SELECT_IMAGE "Select CD-ROM image..." + IDS_CD_SELECT_IMAGE_TITLE "Select CD-ROM image" + IDS_CD_SELECT_FILTER "CD images%s" IDS_SEL_FILTERS "Filters" IDS_SEL_HARDWARE "Hardware" @@ -199,6 +201,14 @@ BEGIN IDS_MENU_5 "Save state to active slot (no %d)\tF10" IDS_MENU_6 "no game selected" + IDS_NUMDIAL_NUM_FRAMES "Number of Frames" + IDS_NUMDIAL_FILTER_SHARP "Select desired filter sharpness" + + IDS_CHEAT_SEARCH_NEW "New cheat search started" + IDS_CHEAT_SEARCH_ADD_MATCH "%i Addresses Matched" + IDS_CHEAT_SEARCH_RESULTS "Address %08X Value %02X" + IDS_CHEAT_SEARCH_EXIT "Cheat search exited" + IDS_LANG_ENGLISH_US "English (US)" IDS_LANG_SIMP_CHINESE "Simplified Chinese" IDS_LANG_TRAD_CHINESE "Traditional Chinese" diff --git a/whatsnew.html b/whatsnew.html index fb0195fb2..f767ddc87 100644 --- a/whatsnew.html +++ b/whatsnew.html @@ -106,6 +106,7 @@

v0.2.97.17