--- np2/macosx/np2.cpp	2003/10/23 06:26:16	1.12
+++ np2/macosx/np2.cpp	2003/10/23 21:00:24	1.14
@@ -28,12 +28,13 @@
 #include	"statsave.h"
 #include	"mousemng.h"
 #include	"configure.h"
+#include	"screenopt.h"
 
 
 #define	USE_RESUME
 
 
-		NP2OSCFG	np2oscfg = {0, 2, 0, 0, 0, 0};
+		NP2OSCFG	np2oscfg = {0, 2, 0, 0, 0, 0, 1, 0};
 
 		WindowPtr	hWndMain;
 		BOOL		np2running;
@@ -255,6 +256,10 @@ static void HandleMenuChoice(long wParam
 			break;
 
 #if defined(NP2GCC)
+		case IDM_SCREENOPT:
+			initScreenOpt();
+			break;
+
         case IDM_MOUSE:
             mouse_running(MOUSE_XOR);
             menu_setmouse(np2oscfg.MOUSE_SW ^ 1);
@@ -656,7 +661,9 @@ int main(int argc, char *argv[]) {
 	pccore_reset();
 
 #if defined(USE_RESUME)
-	flagload(np2resume);
+    if (np2oscfg.resume) {
+        flagload(np2resume);
+    }
 #endif
 
 #if 0
@@ -724,7 +731,6 @@ int main(int argc, char *argv[]) {
 #endif
 					pccore_exec(framecnt == 0);
 					framecnt++;
-					// ¥Æ¥¹¥È
 					cnt = timing_getcount();
 					if (framecnt > cnt) {
 						waitcnt = framecnt;
@@ -737,7 +743,7 @@ int main(int argc, char *argv[]) {
 							framemax++;
 						}
 						if (cnt >= 12) {
-							timing_init();
+							timing_reset();
 						}
 						else {
 							timing_setcount(cnt - framecnt);
@@ -757,7 +763,9 @@ int main(int argc, char *argv[]) {
 	pccore_cfgupdate();
 
 #if defined(USE_RESUME)
-	flagsave(np2resume);
+    if (np2oscfg.resume) {
+        flagsave(np2resume);
+    }
 #endif
 
 	pccore_term();