--- np2/macos9/np2.cpp	2003/10/23 10:57:49	1.2
+++ np2/macos9/np2.cpp	2003/10/23 15:57:16	1.4
@@ -34,11 +34,7 @@
 #define	USE_RESUME
 
 
-#if defined(NP2GCC)
-		NP2OSCFG	np2oscfg = {0, 2, 0, 0, 0, 0};
-#else
-		NP2OSCFG	np2oscfg = {0, 2, 0, 0, 0};
-#endif
+		NP2OSCFG	np2oscfg = {0, 2, 0, 0,  0, 0};
 
 		WindowPtr	hWndMain;
 		BOOL		np2running;
@@ -143,11 +139,13 @@ static void HandleMenuChoice(long wParam
 			pccore_reset();
 			break;
 
-#if 0
+		case IDM_CONFIGURE:
+			ConfigDialogProc();
+			break;
+
 		case IDM_NEWDISK:
-			newdisk();
+			dialog_newdisk();
 			break;
-#endif
 
 		case IDM_FONT:
 			dialog_font();
@@ -643,9 +641,9 @@ int main(int argc, char *argv[]) {
 	scrndraw_redraw();
 	pccore_reset();
 
-#if defined(USE_RESUME)
-	flagload(np2resume);
-#endif
+	if (np2oscfg.resume) {
+		flagload(np2resume);
+	}
 
 	SetEventMask(everyEvent);
 
@@ -696,7 +694,6 @@ int main(int argc, char *argv[]) {
 					mackbd_callback();
 					pccore_exec(framecnt == 0);
 					framecnt++;
-					// ¥Æ¥¹¥È
 					cnt = timing_getcount();
 					if (framecnt > cnt) {
 						waitcnt = framecnt;
@@ -709,7 +706,7 @@ int main(int argc, char *argv[]) {
 							framemax++;
 						}
 						if (cnt >= 12) {
-							timing_init();
+							timing_reset();
 						}
 						else {
 							timing_setcount(cnt - framecnt);
@@ -728,9 +725,9 @@ int main(int argc, char *argv[]) {
 
 	pccore_cfgupdate();
 
-#if defined(USE_RESUME)
-	flagsave(np2resume);
-#endif
+	if (np2oscfg.resume) {
+		flagsave(np2resume);
+	}
 
 	pccore_term();
 	S98_trash();