From 084d459635c27ea634a654624220887788c2f710 Mon Sep 17 00:00:00 2001
From: OV2 <OV2@sessionclan.de>
Date: Mon, 15 Nov 2010 13:04:36 +0100
Subject: [PATCH] Remove shutdown/master from windows port

---
 win32/wconfig.cpp | 11 -----------
 win32/wlanguage.h |  1 -
 win32/wsnes9x.cpp | 10 ----------
 3 files changed, 22 deletions(-)

diff --git a/win32/wconfig.cpp b/win32/wconfig.cpp
index c36774be..ae2cfab9 100644
--- a/win32/wconfig.cpp
+++ b/win32/wconfig.cpp
@@ -301,8 +301,6 @@ void WinSetDefaultValues ()
 
 	// CPU options
 	Settings.HDMATimingHack = 100;
-	Settings.Shutdown =	false;
-	Settings.ShutdownMaster	= false;
 	Settings.DisableIRQ	= false;
 	Settings.Paused	= false;
 	Timings.H_Max =	SNES_CYCLES_PER_SCANLINE;
@@ -794,8 +792,6 @@ std::vector<ConfigItem> 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)
 {
@@ -818,9 +814,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;
@@ -886,7 +879,6 @@ void WinPostSave(ConfigFile& conf)
 		case 8: Settings.SoundPlaybackRate = 44100; break;
 		case 9: Settings.SoundPlaybackRate = 48000; break;
 	}*/
-	Settings.ShutdownMaster = preSaveShutdownMaster; // revert temp change
 }
 void WinPostLoad(ConfigFile& conf)
 {
@@ -915,8 +907,6 @@ void WinPostLoad(ConfigFile& conf)
 	ConfigFile::SetShowComments(showComments);
 	ConfigFile::SetAlphaSort(configSort==2);
 	ConfigFile::SetTimeSort(configSort==1);
-	loadedShutdownMaster = Settings.ShutdownMaster;
-	preSaveShutdownMaster = Settings.ShutdownMaster;
 
 	WinPostSave(conf);
 }
@@ -990,7 +980,6 @@ void WinRegisterConfigItems()
 	AddUIntC("AutoMaxSkipFramesAtOnce", Settings.AutoMaxSkipFrames, 0, "most frames to skip at once to maintain speed, 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");
diff --git a/win32/wlanguage.h b/win32/wlanguage.h
index 4aacca6d..3126907b 100644
--- a/win32/wlanguage.h
+++ b/win32/wlanguage.h
@@ -512,7 +512,6 @@
 #define MOVIE_LABEL_STARTSETTINGS "Recording Start"
 #define MOVIE_LABEL_CONTSETTINGS "Record Controllers"
 #define MOVIE_LABEL_SYNCSETTINGS "Misc. Recording Settings"
-#define MOVIE_SHUTDOWNMASTER_WARNING "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 cf7f7688..57c1e024 100644
--- a/win32/wsnes9x.cpp
+++ b/win32/wsnes9x.cpp
@@ -1556,16 +1556,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 (op.Path, op.ControllersMask, op.Opts, op.Metadata, wcslen(op.Metadata));
 					startingMovie = false;