--- np2/win9x/np2.cpp	2003/10/16 17:58:56	1.1
+++ np2/win9x/np2.cpp	2003/10/18 10:00:29	1.4
@@ -51,9 +51,6 @@
 
 #define	STATSAVEMAX		10
 
-static	char		np2help[] = "np2.hlp";
-static	char		np2resume[] = "sav";
-
 static	char		szClassName[] = "NP2-MainWindow";
 		HWND		hWndMain;
 		HINSTANCE	hInst;
@@ -86,6 +83,9 @@ static	int		np2opening = 1;
 static	int		np2quitmsg = 0;
 		HMENU	hStat = NULL;
 
+static const char np2help[] = "np2.hlp";
+static const char np2resume[] = "sav";
+
 
 typedef struct {
 const char	*str;
@@ -323,13 +323,11 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT
 				case IDM_SCRNMUL10:
 				case IDM_SCRNMUL12:
 				case IDM_SCRNMUL16:
-#if 0
-					if ((SCREENMODE & SCMD_WINDOWED) &&
+					if ((!scrnmng_isfullscreen()) &&
 						!(GetWindowLong(hWndMain, GWL_STYLE) & WS_MINIMIZE)) {
 						xmenu_setscrnmul(wParam - IDM_SCRNMUL);
-						ddraws_setmul(wParam - IDM_SCRNMUL);
+						scrnmng_setmultiple(wParam - IDM_SCRNMUL);
 					}
-#endif
 					break;
 
 				default:
@@ -1079,9 +1077,9 @@ static void processwait(WORD cnt) {
 		scrnmng_dispclock();
 		keydisp_draw(np2oscfg.DRAW_SKIP);
 		viewer_allreload(FALSE);
-		if (np2oscfg.DISPCLK & 2) {
+		if (np2oscfg.DISPCLK & 3) {
 			if (sysmng_workclockrenewal()) {
-				sysmng_updatecaption(2);
+				sysmng_updatecaption(3);
 			}
 		}
 	}
@@ -1110,7 +1108,7 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 
 	srand((unsigned)time(NULL));
 
-//	np2arg_analize(lpszCmdLine);
+	np2arg_analize(lpszCmdLine);
 
 	CopyMemory(szClassName, np2oscfg.winid, 3);