Win32: Fix frameskip menu and reinstate removed frameskip strings. They're all correct, now.

Windows/WndMainWindow.cpp

@@ -280,8 +280,26 @@ namespace MainWindow
 	}
 
 	void setFrameSkipping(int framesToSkip) {
-		I18NCategory *g = GetI18NCategory("Graphics");
 		g_Config.iFrameSkip = framesToSkip;
+
+		I18NCategory *g = GetI18NCategory("Graphics");
+
+		char message[256];
+		memset(message, 0, sizeof(message));
+
+		switch(g_Config.iFrameSkip) {
+		case 0:
+			sprintf(message, "Frameskipping: Off");
+			break;
+		case 1:
+			sprintf(message, "Frameskipping: Auto");
+			break;
+		default:
+			sprintf(message, "Frameskipping: %d frames", g_Config.iFrameSkip);
+			break;
+		}
+
+		osm.Show(g->T(message)); 
 	}
 
 	void enableCheats(bool cheats) {
@@ -888,10 +906,6 @@ namespace MainWindow
 					break;
 
 				case ID_OPTIONS_FRAMESKIP_8:
-					setFrameSkipping(FRAMESKIP_8);
-					break;
-
-				case ID_OPTIONS_FRAMESKIP_9:
 					setFrameSkipping(FRAMESKIP_MAX);
 					break;
 
@@ -1350,7 +1364,7 @@ namespace MainWindow
 
 		static const int frameskipping[] = {
 			ID_OPTIONS_FRAMESKIP_0,
-			ID_OPTIONS_FRAMESKIP_1,
+			ID_OPTIONS_FRAMESKIP_AUTO,
 			ID_OPTIONS_FRAMESKIP_2,
 			ID_OPTIONS_FRAMESKIP_3,
 			ID_OPTIONS_FRAMESKIP_4,
@@ -1358,7 +1372,6 @@ namespace MainWindow
 			ID_OPTIONS_FRAMESKIP_6,
 			ID_OPTIONS_FRAMESKIP_7,
 			ID_OPTIONS_FRAMESKIP_8,
-			ID_OPTIONS_FRAMESKIP_9,
 		};
 		if(g_Config.iFrameSkip < FRAMESKIP_OFF)
 			g_Config.iFrameSkip = FRAMESKIP_OFF;

Windows/WndMainWindow.h

@@ -15,7 +15,7 @@ namespace MainWindow
 
 	enum {
 		FRAMESKIP_OFF = 0,
-		FRAMESKIP_1 = 1,
+		FRAMESKIP_AUTO = 1,
 		FRAMESKIP_2 = 2,
 		FRAMESKIP_3 = 3,
 		FRAMESKIP_4 = 4,
@@ -23,8 +23,7 @@ namespace MainWindow
 		FRAMESKIP_6 = 6,
 		FRAMESKIP_7 = 7,
 		FRAMESKIP_8 = 8,
-		FRAMESKIP_9 = 9,
-		FRAMESKIP_MAX = FRAMESKIP_9,
+		FRAMESKIP_MAX = FRAMESKIP_8,
 
 		ZOOM_NATIVE = 1,
 		ZOOM_2X = 2,