--- xmil/win9x/ini.cpp	2004/08/03 12:50:54	1.2
+++ xmil/win9x/ini.cpp	2004/08/09 02:47:02	1.7
@@ -65,7 +65,7 @@ const OEMCHAR	*item;
 				break;
 
 			case INITYPE_HEX8:
-				SPRINTF(work, str_x, *(UINT8 *)p->value),
+				OEMSPRINTF(work, str_x, *(UINT8 *)p->value),
 				GetPrivateProfileString(title, item, work,
 												work, NELEMENTS(work), path);
 				val = (UINT8)milstr_solveHEX(work);
@@ -73,7 +73,7 @@ const OEMCHAR	*item;
 				break;
 
 			case INITYPE_HEX16:
-				SPRINTF(work, str_x, *(UINT16 *)p->value),
+				OEMSPRINTF(work, str_x, *(UINT16 *)p->value),
 				GetPrivateProfileString(title, item, work,
 												work, NELEMENTS(work), path);
 				val = (UINT16)milstr_solveHEX(work);
@@ -81,7 +81,7 @@ const OEMCHAR	*item;
 				break;
 
 			case INITYPE_HEX32:
-				SPRINTF(work, str_x, *(UINT32 *)p->value),
+				OEMSPRINTF(work, str_x, *(UINT32 *)p->value),
 				GetPrivateProfileString(title, item, work,
 												work, NELEMENTS(work), path);
 				val = (UINT32)milstr_solveHEX(work);
@@ -116,39 +116,39 @@ const OEMCHAR	*set;
 					break;
 
 				case INITYPE_SINT8:
-					SPRINTF(work, str_d, *((SINT8 *)p->value));
+					OEMSPRINTF(work, str_d, *((SINT8 *)p->value));
 					break;
 
 				case INITYPE_SINT16:
-					SPRINTF(work, str_d, *((SINT16 *)p->value));
+					OEMSPRINTF(work, str_d, *((SINT16 *)p->value));
 					break;
 
 				case INITYPE_SINT32:
-					SPRINTF(work, str_d, *((SINT32 *)p->value));
+					OEMSPRINTF(work, str_d, *((SINT32 *)p->value));
 					break;
 
 				case INITYPE_UINT8:
-					SPRINTF(work, str_u, *((UINT8 *)p->value));
+					OEMSPRINTF(work, str_u, *((UINT8 *)p->value));
 					break;
 
 				case INITYPE_UINT16:
-					SPRINTF(work, str_u, *((UINT16 *)p->value));
+					OEMSPRINTF(work, str_u, *((UINT16 *)p->value));
 					break;
 
 				case INITYPE_UINT32:
-					SPRINTF(work, str_u, *((UINT32 *)p->value));
+					OEMSPRINTF(work, str_u, *((UINT32 *)p->value));
 					break;
 
 				case INITYPE_HEX8:
-					SPRINTF(work, str_x, *((UINT8 *)p->value));
+					OEMSPRINTF(work, str_x, *((UINT8 *)p->value));
 					break;
 
 				case INITYPE_HEX16:
-					SPRINTF(work, str_x, *((UINT16 *)p->value));
+					OEMSPRINTF(work, str_x, *((UINT16 *)p->value));
 					break;
 
 				case INITYPE_HEX32:
-					SPRINTF(work, str_x, *((UINT32 *)p->value));
+					OEMSPRINTF(work, str_x, *((UINT32 *)p->value));
 					break;
 
 				default:
@@ -187,36 +187,31 @@ static const INITBL iniitem[] = {
 	{"Win_Snap", INITYPE_BOOL,		&xmiloscfg.WINSNAP,		0},
 	{"backgrnd", INIAND_UINT8,		&xmiloscfg.background,	0x03},
 	{"DspClock", INIAND_UINT8,		&xmiloscfg.DISPCLK,		0x03},
-
-	{"StartDir", INITYPE_STR,		fddfolder,				MAX_PATH},
+	{"s_NOWAIT", INITYPE_BOOL,		&xmiloscfg.NOWAIT,		0},
+	{"SkpFrame", INITYPE_UINT8,		&xmiloscfg.DRAW_SKIP,	0},
+	{"FDfolder", INITYPE_STR,		fddfolder,				MAX_PATH},
 	{"bmap_Dir", INITYPE_STR,		bmpfilefolder,			MAX_PATH},
 
 	{"IPL_TYPE", INIMAX_UINT8,		&xmilcfg.ROM_TYPE,		3},
 	{"cpu_8MHz", INITYPE_BOOL,		&xmilcfg.CPU8MHz,		0},
-
 	{"Resolute", INITYPE_HEX8,		&xmilcfg.DIP_SW,		0},
-	{"SkipLine", INITYPE_BOOL,		&xmilcfg.SKIP_LINE,		0},
-	{"s_NOWAIT", INITYPE_BOOL,		&xmilcfg.NOWAIT,		0},
-	{"SkpFrame", INITYPE_UINT8,		&xmilcfg.DRAW_SKIP,		0},
-	{"LinLIGHT", INITYPE_HEX8,		&xmilcfg.LINEDEPTH,		0},
-	{"BlkLIGHT", INITYPE_HEX8,		&xmilcfg.BLKLIGHT,		0},
-	{"TxtLIGHT", INITYPE_HEX8,		&xmilcfg.LINETEXT,		0},
-	{"Text_Ext", INITYPE_BOOL,		&xmilcfg.TEXTMODE,		0},
-	{"Text_400", INITYPE_HEX8,		&xmilcfg.TEXT400L,		0},
 
-	{"OPMsound", INITYPE_BOOL,		&xmilcfg.SOUND_SW,		0},
+	{"DispSync", INITYPE_BOOL,		&xmilcfg.DISPSYNC,		0},
+	{"Real_Pal", INITYPE_BOOL,		&xmilcfg.RASTER,		0},
+	{"skipline", INITYPE_BOOL,		&xmilcfg.skipline,		0},
+	{"skplight", INITYPE_UINT16,	&xmilcfg.skiplight,		0},
+
 	{"SampleHz", INITYPE_UINT16,	&xmilcfg.samplingrate,	0},
 	{"Latencys", INITYPE_UINT16,	&xmilcfg.delayms,		0},
-	{"SoundPly", INITYPE_BOOL,		&xmilcfg.SOUNDPLY,		0},
+	{"OPMsound", INITYPE_BOOL,		&xmilcfg.SOUND_SW,		0},
 	{"Seek_Snd", INITYPE_BOOL,		&xmilcfg.MOTOR,			0},
 	{"Seek_Vol", INIMAX_UINT8,		&xmilcfg.MOTORVOL,		100},
 
+	{"MouseInt", INITYPE_BOOL,		&xmilcfg.MOUSE_SW,		0},
 	{"btnRAPID", INITYPE_BOOL,		&xmilcfg.BTN_RAPID,		0},
 	{"btn_MODE", INITYPE_BOOL,		&xmilcfg.BTN_MODE,		0},
-	{"MouseInt", INITYPE_BOOL,		&xmilcfg.MOUSE_SW,		0},
 
 	{"Joystick", INITYPE_BOOL,		&xmiloscfg.JOYSTICK,	0},
-
 	{"clocknow", INITYPE_UINT8,		&xmiloscfg.clockx,		0},
 	{"clockfnt", INITYPE_UINT8,		&xmiloscfg.clockfnt,	0},
 	{"clock_up", INIROAND_HEX32,	&xmiloscfg.clockcolor1,	0xffffff},