--- np2/win9x/menu.cpp	2004/02/11 17:39:59	1.11
+++ np2/win9x/menu.cpp	2004/02/13 20:31:55	1.12
@@ -29,7 +29,6 @@ static const char smenu_1280x800[] = "12
 
 static const char smenu_memdump[] = "&Memory Dump";
 static const char smenu_dbguty[] = "&Debug Utility";
-static const char menu_i286save[] = "&i286 save";
 
 static const SMENUITEM smenuitem[] = {
 			{smenu_toolwin,		IDM_TOOLWIN},
@@ -171,9 +170,9 @@ void menu_addmenubar(HMENU popup, HMENU 
 
 // ----
 
-static const char xmenu_stat[] = "S&tat";
-static const char xmenu_statsave[] = "Save %d";
-static const char xmenu_statload[] = "Load %d";
+static const char xmenu_i286save[] = "&i286 save";
+
+#if defined(SUPPORT_SCSI)
 static const char xmenu_scsi[] = "SCSI #%d";
 static const char xmenu_open[] = "&Open...";
 static const char xmenu_remove[] = "&Remove";
@@ -191,13 +190,38 @@ static void addscsimenu(HMENU hMenu, UIN
 	SPRINTF(buf, xmenu_scsi, drv);
 	AppendMenu(hMenu, MF_POPUP, (UINT32)hSubMenu, buf);
 }
+#endif
+
+#if defined(SUPPORT_STATSAVE)
+static const char xmenu_stat[] = "S&tat";
+static const char xmenu_statsave[] = "Save %u";
+static const char xmenu_statload[] = "Load %u";
+
+static void addstatsavemenu(HMENU hMenu) {
+
+	HMENU	hSubMenu;
+	UINT	i;
+	char	buf[16];
+
+	hSubMenu = CreatePopupMenu();
+	for (i=0; i<SUPPORT_STATSAVE; i++) {
+		SPRINTF(buf, xmenu_statsave, i);
+		AppendMenu(hSubMenu, MF_STRING, IDM_FLAGSAVE + i, buf);
+	}
+	AppendMenu(hSubMenu, MF_MENUBARBREAK, 0, NULL);
+	for (i=0; i<SUPPORT_STATSAVE; i++) {
+		SPRINTF(buf, xmenu_statload, i);
+		AppendMenu(hSubMenu, MF_STRING, IDM_FLAGLOAD + i, buf);
+	}
+	InsertMenu(hMenu, 1, MF_BYPOSITION | MF_POPUP,
+											(UINT32)hSubMenu, xmenu_stat);
+}
+#endif
 
 void xmenu_initialize(void) {
 
 	HMENU	hMenu;
 	HMENU	hSubMenu;
-	int		i;
-	char	buf[16];
 
 	hMenu = np2class_gethmenu(hWndMain);
 
@@ -211,19 +235,16 @@ void xmenu_initialize(void) {
 #endif
 
 	// めにゅー追加
+#if defined(SUPPORT_STATSAVE)
 	if (np2oscfg.statsave) {
-		hSubMenu = CreatePopupMenu();
-		for (i=0; i<STATSAVEMAX; i++) {
-			SPRINTF(buf, xmenu_statsave, i);
-			AppendMenu(hSubMenu, MF_STRING, IDM_FLAGSAVE + i, buf);
-		}
-		AppendMenu(hSubMenu, MF_MENUBARBREAK, 0, NULL);
-		for (i=0; i<STATSAVEMAX; i++) {
-			SPRINTF(buf, xmenu_statload, i);
-			AppendMenu(hSubMenu, MF_STRING, IDM_FLAGLOAD + i, buf);
-		}
-		InsertMenu(hMenu, 1, MF_BYPOSITION | MF_POPUP,
-												(UINT32)hSubMenu, xmenu_stat);
+		addstatsavemenu(hMenu);
+	}
+#endif
+
+	if (np2oscfg.I286SAVE) {
+		hSubMenu = GetSubMenu(hMenu, 6);
+		InsertMenu(hSubMenu, 10,
+					MF_BYPOSITION | MF_STRING, IDM_I286SAVE, xmenu_i286save);
 	}
 }
 
@@ -446,11 +467,3 @@ void xmenu_setsstp(BYTE value) {
 	CheckMenuItem(np2class_gethmenu(hWndMain), IDM_SSTP, MFCHECK(value));
 }
 
-void xmenu_seti286save(BYTE value) {
-
-	if (value) {
-		InsertMenu(GetSubMenu(np2class_gethmenu(hWndMain), 6), 10,
-					MF_BYPOSITION | MF_STRING, IDM_I286SAVE, menu_i286save);
-	}
-}
-