diff --git a/win32/rsrc/snes9x.rc b/win32/rsrc/snes9x.rc index d25649f6..7d744f39 100644 --- a/win32/rsrc/snes9x.rc +++ b/win32/rsrc/snes9x.rc @@ -536,6 +536,20 @@ BEGIN LTEXT "not found",IDC_MULTICART_BIOSNOTFOUND,280,50,54,8 END +IDD_NETCONNECT DIALOGEX 0, 0, 227, 61 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUP | WS_CLIPCHILDREN | WS_CAPTION +CAPTION "Connect to Server" +FONT 8, "MS Sans Serif", 0, 0, 0x0 +BEGIN + DEFPUSHBUTTON "&OK",IDOK,120,45,50,14 + PUSHBUTTON "Canccel",IDCANCEL,175,45,50,14 + RTEXT "Server Address",IDC_LABEL_SERVERADDY,5,5,50,14,SS_CENTERIMAGE + PUSHBUTTON "Clear History",IDC_CLEARHISTORY,175,5,50,14 + RTEXT "Port Number",IDC_LABEL_PORTNUM,5,25,50,14,SS_CENTERIMAGE + EDITTEXT IDC_PORTNUMBER,60,25,25,14,ES_AUTOHSCROLL + COMBOBOX IDC_HOSTNAME,60,5,110,40,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP +END + ///////////////////////////////////////////////////////////////////////////// // @@ -708,8 +722,8 @@ IDI_ICON1 ICON "icon1.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,5,2,0 - PRODUCTVERSION 1,5,2,0 + FILEVERSION 1,5,3,0 + PRODUCTVERSION 1,5,3,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -726,12 +740,12 @@ BEGIN BEGIN VALUE "CompanyName", "http://www.snes9x.com" VALUE "FileDescription", "Snes9X" - VALUE "FileVersion", "1.52" + VALUE "FileVersion", "1.53" VALUE "InternalName", "Snes9X" - VALUE "LegalCopyright", "Copyright 1996-2010" + VALUE "LegalCopyright", "Copyright 1996-2011" VALUE "OriginalFilename", "Snes9X.exe" VALUE "ProductName", "Snes9X SNES Emulator" - VALUE "ProductVersion", "1.52" + VALUE "ProductVersion", "1.53" END END BLOCK "VarFileInfo" @@ -765,25 +779,6 @@ END #endif // APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - -IDD_NETCONNECT DIALOGEX 0, 0, 227, 61 -STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUP | WS_CLIPCHILDREN | WS_CAPTION -CAPTION "Connect to Server" -FONT 8, "MS Sans Serif", 0, 0, 0x0 -BEGIN - DEFPUSHBUTTON "&OK",IDOK,120,45,50,14 - PUSHBUTTON "Canccel",IDCANCEL,175,45,50,14 - RTEXT "Server Address",IDC_LABEL_SERVERADDY,5,5,50,14,SS_CENTERIMAGE - PUSHBUTTON "Clear History",IDC_CLEARHISTORY,175,5,50,14 - RTEXT "Port Number",IDC_LABEL_PORTNUM,5,25,50,14,SS_CENTERIMAGE - EDITTEXT IDC_PORTNUMBER,60,25,25,14,ES_AUTOHSCROLL - COMBOBOX IDC_HOSTNAME,60,5,110,40,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP -END - ///////////////////////////////////////////////////////////////////////////// // @@ -846,8 +841,8 @@ BEGIN BEGIN MENUITEM "&Pause", ID_FILE_PAUSE MENUITEM "Pause &When Inactive", ID_EMULATION_PAUSEWHENINACTIVE - MENUITEM "&Frame Advance", ID_FRAME_ADVANCE - MENUITEM SEPARATOR + MENUITEM "&Frame Advance", ID_FRAME_ADVANCE + MENUITEM SEPARATOR MENUITEM "&Settings...\tAlt+F8", ID_OPTIONS_SETTINGS END POPUP "&Input" @@ -919,13 +914,13 @@ BEGIN BEGIN MENUITEM "&Hide menubar\tEsc", ID_WINDOW_HIDEMENUBAR MENUITEM "&Full Screen\tAlt+Enter", ID_WINDOW_FULLSCREEN - POPUP "&Window Size" - BEGIN - MENUITEM "&1x" ID_WINDOW_SIZE_1X - MENUITEM "&2x" ID_WINDOW_SIZE_2X - MENUITEM "&3x" ID_WINDOW_SIZE_3X - MENUITEM "&4x" ID_WINDOW_SIZE_4X - END + POPUP "&Window Size" + BEGIN + MENUITEM "&1x", ID_WINDOW_SIZE_1X + MENUITEM "&2x", ID_WINDOW_SIZE_2X + MENUITEM "&3x", ID_WINDOW_SIZE_3X + MENUITEM "&4x", ID_WINDOW_SIZE_4X + END MENUITEM SEPARATOR MENUITEM "&Stretch Image\tAlt+Backspace", ID_WINDOW_STRETCH MENUITEM "&Maintain Aspect Ratio", ID_WINDOW_ASPECTRATIO diff --git a/win32/wconfig.cpp b/win32/wconfig.cpp index f27ca36e..a4a4dac3 100644 --- a/win32/wconfig.cpp +++ b/win32/wconfig.cpp @@ -271,7 +271,6 @@ void WinSetDefaultValues () Settings.MultiPlayer5Master = false; Settings.SuperScopeMaster = false; Settings.MouseMaster = false; - //Settings.SuperFX = false; #ifdef NETPLAY_SUPPORT Settings.Port = 1996; @@ -728,8 +727,6 @@ std::vector configItems; static char filterString [1024], filterString2 [1024], snapVerString [256]; static bool niceAlignment, showComments, readOnlyConfig; static int configSort; -static BOOL loadedShutdownMaster; -static BOOL preSaveShutdownMaster; void WinPreSave(ConfigFile& conf) { @@ -752,9 +749,6 @@ void WinPreSave(ConfigFile& conf) } sprintf(snapVerString, "Snapshot save version. Must be between 1 and %d (inclusive)", SNAPSHOT_VERSION); - preSaveShutdownMaster = Settings.ShutdownMaster; - Settings.ShutdownMaster &= loadedShutdownMaster; // never save change-to-true of speed hacks during execution - // GetWindowRect (GUI.hWnd, &GUI.window_size); GUI.window_size.right -= GUI.window_size.left; GUI.window_size.bottom -= GUI.window_size.top; @@ -795,7 +789,6 @@ void WinPostSave(ConfigFile& conf) GUI.window_size.bottom += GUI.window_size.top; GUI.window_size.right += extra_width; GUI.window_size.bottom += extra_height; - Settings.ShutdownMaster = preSaveShutdownMaster; // revert temp change } void WinPostLoad(ConfigFile& conf) { @@ -823,8 +816,6 @@ void WinPostLoad(ConfigFile& conf) ConfigFile::SetShowComments(showComments); ConfigFile::SetAlphaSort(configSort==2); ConfigFile::SetTimeSort(configSort==1); - loadedShutdownMaster = Settings.ShutdownMaster; - preSaveShutdownMaster = Settings.ShutdownMaster; WinPostSave(conf); } @@ -902,7 +893,6 @@ void WinRegisterConfigItems() AddUIntC("AutoMaxSkipFramesAtOnce", Settings.AutoMaxSkipFrames, 0, "most frames to skip at once to maintain speed in automatic mode, don't set to more than 1 or 2 frames because the skipping algorithm isn't very smart"); AddUIntC("TurboFrameSkip", Settings.TurboSkipFrames, 15, "how many frames to skip when in fast-forward mode"); AddUInt("AutoSaveDelay", Settings.AutoSaveDelay, 30); - AddBool2C("SpeedHacks", Settings.ShutdownMaster, false, "on to skip emulating the CPU when it is not being used ... recommended OFF"); AddBool("BlockInvalidVRAMAccess", Settings.BlockInvalidVRAMAccessMaster, true); AddBool2C("SnapshotScreenshots", Settings.SnapshotScreenshots, true, "on to save the screenshot in each snapshot, for loading-when-paused display"); AddBoolC("MovieTruncateAtEnd", Settings.MovieTruncate, true, "true to truncate any leftover data in the movie file after the current frame when recording stops"); @@ -1019,7 +1009,7 @@ void WinRegisterConfigItems() ADDN(SelectSave[0],SelectSlot0); ADDN(SelectSave[1],SelectSlot1); ADDN(SelectSave[2],SelectSlot2); ADDN(SelectSave[3],SelectSlot3); ADDN(SelectSave[4],SelectSlot4); ADDN(SelectSave[5],SelectSlot5); ADDN(SelectSave[6],SelectSlot6); ADDN(SelectSave[7],SelectSlot7); ADDN(SelectSave[8],SelectSlot8); ADDN(SelectSave[9],SelectSlot9); ADD(SaveScreenShot); ADD(SlotPlus); ADD(SlotMinus); ADD(SlotSave); ADD(SlotLoad); ADD(BGL1); ADD(BGL2); ADD(BGL3); ADD(BGL4); ADD(BGL5); - ADD(ClippingWindows); /*ADD(BGLHack);*/ ADD(Transparency); ADD(HDMA); /*ADD(GLCube);*/ + ADD(ClippingWindows); /*ADD(BGLHack);*/ ADD(Transparency); /*ADD(HDMA)*/; /*ADD(GLCube);*/ /*ADD(InterpMode7);*/ ADD(JoypadSwap); ADD(SwitchControllers); ADD(ResetGame); ADD(ToggleCheats); ADD(TurboA); ADD(TurboB); ADD(TurboY); ADD(TurboX); ADD(TurboL); ADD(TurboR); ADD(TurboStart); ADD(TurboSelect); ADD(TurboUp); ADD(TurboDown); ADD(TurboLeft); ADD(TurboRight); #undef ADD diff --git a/win32/wlanguage.h b/win32/wlanguage.h index 14a6b719..f4b9d6cb 100644 --- a/win32/wlanguage.h +++ b/win32/wlanguage.h @@ -179,7 +179,7 @@ /* This is where all the GUI text strings will eventually end up */ -#define WINDOW_TITLE TEXT("Snes9X v1.5X Testing") +#define WINDOW_TITLE TEXT("Snes9X v%s for Windows") // the windows registry is no longer used //#define MY_REG_KEY "Software\\Emulators\\Snes9X" @@ -511,7 +511,6 @@ #define MOVIE_LABEL_STARTSETTINGS TEXT("Recording Start") #define MOVIE_LABEL_CONTSETTINGS TEXT("Record Controllers") #define MOVIE_LABEL_SYNCSETTINGS TEXT("Misc. Recording Settings") -#define MOVIE_SHUTDOWNMASTER_WARNING TEXT("The \"SpeedHacks\" setting in your snes9x.cfg file is on.\nThis makes emulation less CPU-intensive, but also less accurate,\ncausing some games to lag noticeably more than they should.\nYou might want to reconsider recording a movie under these conditions.") // Save Messages diff --git a/win32/wsnes9x.cpp b/win32/wsnes9x.cpp index cba682bb..cdd0d5b3 100644 --- a/win32/wsnes9x.cpp +++ b/win32/wsnes9x.cpp @@ -532,7 +532,6 @@ struct SCustomKeys CustomKeys = { {'8',0}, // Clipping Windows // {'8',0}, // BG Layering hack {'9',0}, // Transparency - {'0',0}, // HDMA Emulation // {'6',CUSTKEY_SHIFT_MASK}, // GLCube Mode // {'9',CUSTKEY_SHIFT_MASK}, // Interpolate Mode 7 {'6',0}, // Joypad Swap @@ -1158,12 +1157,6 @@ int HandleKeyMessage(WPARAM wParam, LPARAM lParam) S9xSetInfoString (InfoString); hitHotKey = true; } - if(wParam == CustomKeys.HDMA.key - && modifiers == CustomKeys.HDMA.modifiers) - { - Settings.DisableHDMA = !Settings.DisableHDMA; - S9xDisplayStateChange (WINPROC_HDMA_TEXT, !Settings.DisableHDMA); - } if(wParam == CustomKeys.BGL1.key && modifiers == CustomKeys.BGL1.modifiers) { @@ -1583,16 +1576,6 @@ LRESULT CALLBACK WinProc( if(DialogBoxParam(g_hInst, MAKEINTRESOURCE(IDD_CREATEMOVIE), hWnd, DlgCreateMovie, (LPARAM)&op) && op.Path[0]!='\0') { - if(Settings.ShutdownMaster) - { - static bool seenItOnce = false; - if(!seenItOnce) - { - seenItOnce = true; - MessageBox(hWnd, MOVIE_SHUTDOWNMASTER_WARNING, SNES9X_WARN, MB_OK); - } - } - startingMovie = true; int err=S9xMovieCreate (_tToChar(op.Path), op.ControllersMask, op.Opts, op.Metadata, wcslen(op.Metadata)); startingMovie = false; @@ -7764,8 +7747,7 @@ static void set_hotkeyinfo(HWND hDlg) SendDlgItemMessage(hDlg,IDC_HOTKEY5,WM_USER+44,CustomKeys.BGL5.key,CustomKeys.BGL5.modifiers); SendDlgItemMessage(hDlg,IDC_HOTKEY6,WM_USER+44,CustomKeys.ClippingWindows.key,CustomKeys.ClippingWindows.modifiers); SendDlgItemMessage(hDlg,IDC_HOTKEY7,WM_USER+44,CustomKeys.Transparency.key,CustomKeys.Transparency.modifiers); - SendDlgItemMessage(hDlg,IDC_HOTKEY8,WM_USER+44,CustomKeys.HDMA.key,CustomKeys.HDMA.modifiers); - SendDlgItemMessage(hDlg,IDC_HOTKEY9,WM_USER+44,0,0); +// SendDlgItemMessage(hDlg,IDC_HOTKEY8,WM_USER+44,CustomKeys.HDMA.key,CustomKeys.HDMA.modifiers); SendDlgItemMessage(hDlg,IDC_HOTKEY10,WM_USER+44,CustomKeys.SwitchControllers.key,CustomKeys.SwitchControllers.modifiers); SendDlgItemMessage(hDlg,IDC_HOTKEY11,WM_USER+44,CustomKeys.JoypadSwap.key,CustomKeys.JoypadSwap.modifiers); SendDlgItemMessage(hDlg,IDC_HOTKEY12,WM_USER+44,CustomKeys.ResetGame.key,CustomKeys.ResetGame.modifiers); @@ -7988,7 +7970,7 @@ switch(msg) break; case IDC_HOTKEY8: if(index == 0) CustomKeys.ScopeTurbo.key = wParam, CustomKeys.ScopeTurbo.modifiers = modifiers; - if(index == 1) CustomKeys.HDMA.key = wParam, CustomKeys.HDMA.modifiers = modifiers; +// if(index == 1) CustomKeys.HDMA.key = wParam, CustomKeys.HDMA.modifiers = modifiers; if(index == 2) CustomKeys.TurboSelect.key = wParam, CustomKeys.TurboSelect.modifiers = modifiers; if(index == 3) CustomKeys.SelectSave[7].key = wParam, CustomKeys.SelectSave[7].modifiers = modifiers; break; diff --git a/win32/wsnes9x.h b/win32/wsnes9x.h index e448b5b4..c63791dc 100644 --- a/win32/wsnes9x.h +++ b/win32/wsnes9x.h @@ -451,8 +451,8 @@ struct SCustomKeys { SCustomKey ClippingWindows; // SCustomKey BGLHack; SCustomKey Transparency; - SCustomKey HDMA; - //SCustomKey GLCube; +// SCustomKey GLCube; +// SCustomKey HDMA; // SCustomKey InterpMode7; SCustomKey JoypadSwap; SCustomKey SwitchControllers;