--- np2/x11/ini.c	2007/02/04 11:51:13	1.19
+++ np2/x11/ini.c	2011/01/15 18:43:13	1.25
@@ -127,11 +127,11 @@ iniwrsetargh8(char *work, int size, cons
 	ptr = (BYTE *)(ini->value);
 	arg = ini->arg;
 	if (arg > 0) {
-		SPRINTF(tmp, "%.2x ", ptr[0]);
+		g_snprintf(tmp, sizeof(tmp), "%.2x ", ptr[0]);
 		milstr_ncpy(work, tmp, size);
 	}
 	for (i = 1; i < arg; i++) {
-		SPRINTF(tmp, "%.2x ", ptr[i]);
+		g_snprintf(tmp, sizeof(tmp), "%.2x ", ptr[i]);
 		milstr_ncat(work, tmp, size);
 	}
 }
@@ -425,39 +425,39 @@ ini_write(const char *path, const char *
 				break;
 
 			case INITYPE_SINT8:
-				SPRINTF(work, "%d", *((char *)p->value));
+				g_snprintf(work, sizeof(work), "%d", *((char *)p->value));
 				break;
 
 			case INITYPE_SINT16:
-				SPRINTF(work, "%d", *((SINT16 *)p->value));
+				g_snprintf(work, sizeof(work), "%d", *((SINT16 *)p->value));
 				break;
 
 			case INITYPE_SINT32:
-				SPRINTF(work, "%d", *((SINT32 *)p->value));
+				g_snprintf(work, sizeof(work), "%d", *((SINT32 *)p->value));
 				break;
 
 			case INITYPE_UINT8:
-				SPRINTF(work, "%u", *((BYTE *)p->value));
+				g_snprintf(work, sizeof(work), "%u", *((BYTE *)p->value));
 				break;
 
 			case INITYPE_UINT16:
-				SPRINTF(work, "%u", *((UINT16 *)p->value));
+				g_snprintf(work, sizeof(work), "%u", *((UINT16 *)p->value));
 				break;
 
 			case INITYPE_UINT32:
-				SPRINTF(work, "%u", *((UINT32 *)p->value));
+				g_snprintf(work, sizeof(work), "%u", *((UINT32 *)p->value));
 				break;
 
 			case INITYPE_HEX8:
-				SPRINTF(work, "%x", *((BYTE *)p->value));
+				g_snprintf(work, sizeof(work), "%x", *((BYTE *)p->value));
 				break;
 
 			case INITYPE_HEX16:
-				SPRINTF(work, "%x", *((UINT16 *)p->value));
+				g_snprintf(work, sizeof(work), "%x", *((UINT16 *)p->value));
 				break;
 
 			case INITYPE_HEX32:
-				SPRINTF(work, "%x", *((UINT32 *)p->value));
+				g_snprintf(work, sizeof(work), "%x", *((UINT32 *)p->value));
 				break;
 
 			case INITYPE_KB:
@@ -468,11 +468,11 @@ ini_write(const char *path, const char *
 				break;
 
 			case INITYPE_SNDDRV:
-				SPRINTF(work, "%s", snddrv_num2drv(*(UINT8 *)p->value));
+				g_snprintf(work, sizeof(work), "%s", snddrv_num2drv(*(UINT8 *)p->value));
 				break;
 
 			case INITYPE_INTERP:
-				SPRINTF(work, "%s", iniwrinterp(*(UINT8 *)p->value));
+				g_snprintf(work, sizeof(work), "%s", iniwrinterp(*(UINT8 *)p->value));
 				break;
 
 			default:
@@ -491,9 +491,12 @@ ini_write(const char *path, const char *
 	file_close(fh);
 }
 
-extern char modulefile[];
-
-static const char ini_title[] = "NekoProjectII";
+static const char ini_title[] =
+#if !defined(CPUCORE_IA32)
+	"NekoProjectII";
+#else
+	"NekoProjectII_IA32";
+#endif
 
 enum {
 	INIRO_STR	= INIFLAG_RO | INITYPE_STR,
@@ -518,7 +521,7 @@ static const INITBL iniitem[] = {
 	{"HDfolder", INITYPE_STR,	hddfolder,		MAX_PATH},
 	{"bmap_Dir", INITYPE_STR,	bmpfilefolder,		MAX_PATH},
 	{"fontfile", INITYPE_STR,	np2cfg.fontfile,	MAX_PATH},
-	{"biospath", INITYPE_STR,	np2cfg.biospath,	MAX_PATH},
+	{"biospath", INIRO_STR,		np2cfg.biospath,	MAX_PATH},
 	{"hdrvroot", INIRO_STR,		np2cfg.hdrvroot,	MAX_PATH},
 	{"hdrv_acc", INIRO_UINT8,	&np2cfg.hdrvacc,	0},
 
@@ -628,8 +631,12 @@ static const INITBL iniitem[] = {
 	{"com3mmdl", INITYPE_STR,	np2oscfg.com[2].mdl,	64},
 	{"com3mdef", INITYPE_STR,	np2oscfg.com[2].def,	MAX_PATH},
 
+#if defined(SUPPORT_RESUME)
 	{"e_resume", INITYPE_BOOL,	&np2oscfg.resume,	0},
+#endif
+#if defined(SUPPORT_STATSAVE)
 	{"STATSAVE", INIRO_BOOL,	&np2oscfg.statsave,	0},
+#endif
 #if defined(GCC_CPU_ARCH_IA32)
 	{"nousemmx", INITYPE_BOOL,	&np2oscfg.disablemmx,	0},
 #endif
@@ -646,6 +653,7 @@ static const INITBL iniitem[] = {
 	{"dinterp_", INITYPE_INTERP,	&np2oscfg.drawinterp,	0},
 	{"fullscrn", INITYPE_UINT32,	&ignore_fullscreen_mode,0},
 	{"F11_KEY_", INITYPE_UINT8,	&np2oscfg.F11KEY,	0},
+	{"READONLY", INIRO_BOOL,	&np2oscfg.cfgreadonly,	0},
 
 	{"I286SAVE", INIRO_BOOL,	&np2oscfg.I286SAVE,	0},
 };