--- np2/x11/np2.c	2007/01/23 15:48:20	1.27
+++ np2/x11/np2.c	2008/03/18 14:47:23	1.30
@@ -113,6 +113,7 @@ NP2OSCFG np2oscfg = {
 
 volatile sig_atomic_t np2running = 0;
 BYTE scrnmode = 0;
+int ignore_fullscreen_mode = 0;
 
 UINT framecnt = 0;
 UINT waitcnt = 0;
@@ -127,6 +128,9 @@ char bmpfilefolder[MAX_PATH];
 char modulefile[MAX_PATH];
 char statpath[MAX_PATH];
 
+const char np2flagext[] = "s%02d";
+const char np2resumeext[] = "sav";
+
 #ifndef FONTFACE
 #define FONTFACE "-misc-fixed-%s-r-normal--%d-*-*-*-*-*-*-*"
 #endif
@@ -203,16 +207,18 @@ flagload(const char* ext, const char* ti
 	int ret;
 	int rv = 0;
 
-	UNUSED(title);
-
 	getstatfilename(path, ext, sizeof(path));
 	ret = statsave_check(path, buf, sizeof(buf));
 	if (ret & (~STATFLAG_DISKCHG)) {
-		fprintf(stderr, "Couldn't restart\n");
+		toolkit_msgbox(title, "Couldn't restart",
+		    TK_MB_OK|TK_MB_ICON_ERROR);
 		rv = 1;
 	} else if ((!force) && (ret & STATFLAG_DISKCHG)) {
-		fprintf(stderr, "Conflict\n");
-		rv = 1;
+		ret = toolkit_msgbox(title, "Conflict!\nContinue?",
+		    TK_MB_YESNO|TK_MB_ICON_QUESTION);
+		if (ret != TK_MB_YES) {
+			rv = 1;
+		}
 	}
 	if (rv == 0) {
 		statsave_load(path);
@@ -369,12 +375,14 @@ mainloop(void *p)
 	return TRUE;
 }
 
-#if defined(GCC_CPU_ARCH_IA32)
 int mmxflag;
 
 int
 havemmx(void)
 {
+#if !defined(GCC_CPU_ARCH_IA32)
+	return 0;
+#else	/* GCC_CPU_ARCH_IA32 */
 	int rv;
 
 #if defined(GCC_CPU_ARCH_AMD64)
@@ -402,6 +410,5 @@ havemmx(void)
 		: "=a" (rv));
 #endif /* GCC_CPU_ARCH_AMD64 */
 	return rv;
-}
-
 #endif /* GCC_CPU_ARCH_IA32 */
+}