--- xmil/win9xc/xmil.cpp	2004/08/12 18:22:54	1.5
+++ xmil/win9xc/xmil.cpp	2005/02/04 06:42:12	1.8
@@ -11,7 +11,6 @@
 #include	"soundmng.h"
 #include	"sysmng.h"
 #include	"scrndraw.h"
-#include	"ddrawbmp.h"
 #include	"winkbd.h"
 #include	"menu.h"
 #include	"ini.h"
@@ -139,8 +138,8 @@ static void xmilcmd(HWND hWnd, UINT cmd)
 			diskdrv_setfdd(1, NULL, 0);
 			break;
 
-		case IDM_TURBOZ:
-			menu_setiplrom(3);
+		case IDM_X1ROM:
+			menu_setiplrom(1);
 			update = SYS_UPDATECFG;
 			break;
 
@@ -149,10 +148,12 @@ static void xmilcmd(HWND hWnd, UINT cmd)
 			update = SYS_UPDATECFG;
 			break;
 
-		case IDM_X1ROM:
-			menu_setiplrom(1);
+#if defined(SUPPORT_TURBOZ)
+		case IDM_TURBOZ:
+			menu_setiplrom(3);
 			update = SYS_UPDATECFG;
 			break;
+#endif
 
 		case IDM_BOOT2D:
 			menu_setbootmedia(0);
@@ -242,10 +243,12 @@ static void xmilcmd(HWND hWnd, UINT cmd)
 			menu_setkey(2);
 			break;
 
+#if defined(SUPPORT_TURBOZ) || defined(SUPPORT_OPM)
 		case IDM_FMBOARD:
 			menu_setsound(xmilcfg.SOUND_SW ^ 1);
 			update = SYS_UPDATECFG;
 			break;
+#endif
 
 		case IDM_JOYSTICK:
 			menu_setjoystick(xmiloscfg.JOYSTICK ^ 1);
@@ -265,7 +268,7 @@ static void xmilcmd(HWND hWnd, UINT cmd)
 
 		case IDM_BMPSAVE:
 			winuienter();
-			bmpsave();
+			dialog_writebmp(hWnd);
 			winuileave();
 			break;
 
@@ -632,7 +635,9 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 	menu_setwaitflg(xmiloscfg.NOWAIT);
 	menu_setframe(xmiloscfg.DRAW_SKIP);
 	menu_setkey(0);
+#if defined(SUPPORT_TURBOZ) || defined(SUPPORT_OPM)
 	menu_setsound(xmilcfg.SOUND_SW);
+#endif
 	menu_setjoystick(xmiloscfg.JOYSTICK);
 	menu_setmouse(xmilcfg.MOUSE_SW);
 	menu_setmotorflg(xmilcfg.MOTOR);