--- np2/win9x/ini.cpp	2004/02/13 08:33:48	1.24
+++ np2/win9x/ini.cpp	2004/03/31 14:02:51	1.27
@@ -11,6 +11,26 @@
 #include	"pccore.h"
 
 
+
+static BOOL inigetbmp(const BYTE *ptr, UINT pos) {
+
+	return((ptr[pos >> 3] >> (pos & 7)) & 1);
+}
+
+static void inisetbmp(BYTE *ptr, UINT pos, BOOL set) {
+
+	UINT8	bit;
+
+	ptr += (pos >> 3);
+	bit = 1 << (pos & 7);
+	if (set) {
+		*ptr |= bit;
+	}
+	else {
+		*ptr &= ~bit;
+	}
+}
+
 static void inirdargs16(const char *src, const INITBL *ini) {
 
 	SINT16	*dst;
@@ -164,6 +184,14 @@ const INITBL	*pterm;
 				*((BYTE *)p->value) = (!milstr_cmp(work, str_true))?1:0;
 				break;
 
+			case INITYPE_BITMAP:
+				GetPrivateProfileString(title, p->item,
+					(inigetbmp((BYTE *)p->value, p->arg))?str_true:str_false,
+												work, sizeof(work), path);
+				inisetbmp((BYTE *)p->value, p->arg,
+										(milstr_cmp(work, str_true) == 0));
+				break;
+
 			case INITYPE_ARGS16:
 				GetPrivateProfileString(title, p->item, str_null,
 												work, sizeof(work), path);
@@ -218,7 +246,7 @@ const INITBL	*pterm;
 				GetPrivateProfileString(title, p->item, work,
 												work, sizeof(work), path);
 				val = (UINT32)milstr_solveHEX(work);
-				*(UINT16 *)p->value = (UINT32)val;
+				*(UINT32 *)p->value = (UINT32)val;
 				break;
 
 			case INITYPE_BYTE3:
@@ -227,13 +255,6 @@ const INITBL	*pterm;
 				inirdbyte3(work, p);
 				break;
 
-			case INITYPE_USERKEY:
-				GetPrivateProfileString(title, p->item, str_null,
-												work, sizeof(work), path);
-				((NKEYM)p->value)->keys = (UINT8)profile_setkeys(work,
-												((NKEYM)p->value)->key, 15);
-				break;
-
 			case INITYPE_KB:
 				GetPrivateProfileString(title, p->item, str_null,
 												work, sizeof(work), path);
@@ -307,11 +328,6 @@ const char		*set;
 					SPRINTF(work, str_x, *((UINT32 *)p->value));
 					break;
 
-				case INITYPE_USERKEY:
-					profile_getkeys(work, sizeof(work),
-							((NKEYM)p->value)->key, ((NKEYM)p->value)->keys);
-					break;
-
 				default:
 					set = NULL;
 					break;
@@ -332,6 +348,7 @@ static const char ini_title[] = "NekoPro
 enum {
 	INIRO_STR			= INITYPE_STR + INIFLAG_RO,
 	INIRO_BOOL			= INITYPE_BOOL + INIFLAG_RO,
+	INIRO_BITMAP		= INITYPE_BITMAP + INIFLAG_RO,
 	INIRO_UINT8			= INITYPE_UINT8 + INIFLAG_RO,
 	INIMAX_UINT8		= INITYPE_UINT8 + INIFLAG_MAX,
 	INIAND_UINT8		= INITYPE_UINT8 + INIFLAG_AND,
@@ -393,7 +410,7 @@ static const INITBL iniitem[] = {
 	{"optSPBVR", INITYPE_HEX8,		&np2cfg.spb_vrc,		0},
 	{"optSPBVL", INIMAX_UINT8,		&np2cfg.spb_vrl,		24},
 	{"optSPB_X", INITYPE_BOOL,		&np2cfg.spb_x,			0},
-	{"optMPU98", INITYPE_HEX8		&np2cfg.mpuopt,			0},
+	{"optMPU98", INITYPE_HEX8,		&np2cfg.mpuopt,			0},
 
 	{"volume_F", INIMAX_UINT8,		&np2cfg.vol_fm,			128},
 	{"volume_S", INIMAX_UINT8,		&np2cfg.vol_ssg,		128},
@@ -432,8 +449,10 @@ static const INITBL iniitem[] = {
 
 	{"calendar", INITYPE_BOOL,		&np2cfg.calendar,		0},
 	{"USE144FD", INITYPE_BOOL,		&np2cfg.usefd144,		0},
-	{"userkey1", INITYPE_USERKEY,	np2cfg.userkey+0,		0},
-	{"userkey2", INITYPE_USERKEY,	np2cfg.userkey+1,		0},
+	{"FDDRIVE1", INIRO_BITMAP,		&np2cfg.fddequip,		0},
+	{"FDDRIVE2", INIRO_BITMAP,		&np2cfg.fddequip,		1},
+	{"FDDRIVE3", INIRO_BITMAP,		&np2cfg.fddequip,		2},
+	{"FDDRIVE4", INIRO_BITMAP,		&np2cfg.fddequip,		3},
 
 
 	// OS°Í¸¡©