--- np2/statsave.c	2004/03/29 14:19:24	1.40
+++ np2/statsave.c	2005/02/07 14:46:07	1.43
@@ -31,6 +31,7 @@
 #include	"keydisp.h"
 #include	"hostdrv.h"
 #include	"calendar.h"
+#include	"keystat.h"
 
 #if defined(MACOS)
 #define	CRCONST		str_cr
@@ -185,7 +186,7 @@ sfo_err1:
 static int statflag_closesection(SFFILEH sffh) {
 
 	UINT	leng;
-	BYTE	zero[16];
+	UINT8	zero[16];
 
 	if (sffh == NULL) {
 		goto sfcs_err1;
@@ -546,7 +547,7 @@ static int nevent_write(STFLAGH sfh, int
 	UINT		i;
 
 	ZeroMemory(&nit, sizeof(nit));
-	for (i=0; i<sizeof(evtnum)/sizeof(ENUMTBL); i++) {
+	for (i=0; i<NELEMENTS(evtnum); i++) {
 		if (evtnum[i].num == num) {
 			nit.id = evtnum[i].id;
 			break;
@@ -590,12 +591,12 @@ static int nevent_read(STFLAGH sfh, UINT
 
 	ret = statflag_read(sfh, &nit, sizeof(nit));
 
-	for (i=0; i<sizeof(evtnum)/sizeof(ENUMTBL); i++) {
+	for (i=0; i<NELEMENTS(evtnum); i++) {
 		if (nit.id == evtnum[i].id) {
 			break;
 		}
 	}
-	if (i < (sizeof(evtnum)/sizeof(ENUMTBL))) {
+	if (i < NELEMENTS(evtnum)) {
 		num = evtnum[i].num;
 		nevent.item[num].clock = nit.clock;
 		nevent.item[num].flag = nit.flag;
@@ -670,7 +671,7 @@ static int flagsave_gij(STFLAGH sfh, con
 	int		ret;
 	int		i;
 	int		j;
-const BYTE	*fnt;
+const UINT8	*fnt;
 
 	ret = STATFLAG_SUCCESS;
 	for (i=0; i<2; i++) {
@@ -689,7 +690,7 @@ static int flagload_gij(STFLAGH sfh, con
 	int		ret;
 	int		i;
 	int		j;
-	BYTE	*fnt;
+	UINT8	*fnt;
 
 	ret = 0;
 	for (i=0; i<2; i++) {
@@ -706,6 +707,8 @@ static int flagload_gij(STFLAGH sfh, con
 
 // ---- FM
 
+#if !defined(DISABLE_SOUND)
+
 enum {
 	FLAG_MG			= 0x0001,
 	FLAG_FM1A		= 0x0002,
@@ -722,8 +725,8 @@ enum {
 };
 
 typedef struct {
-	BYTE	keyreg[OPNCH_MAX];
-	BYTE	extop[4];
+	UINT8	keyreg[OPNCH_MAX];
+	UINT8	extop[4];
 } OPNKEY;
 
 static int flagsave_fm(STFLAGH sfh, const SFENTRY *tbl) {
@@ -919,6 +922,7 @@ static int flagload_fm(STFLAGH sfh, cons
 	(void)t;
 	return(ret);
 }
+#endif
 
 
 // ---- disk
@@ -957,7 +961,7 @@ static int disksave(STFLAGH sfh, const c
 static int flagsave_disk(STFLAGH sfh, const SFENTRY *tbl) {
 
 	int		ret;
-	BYTE	i;
+	UINT8	i;
 
 	sxsi_flash();
 	ret = STATFLAG_SUCCESS;
@@ -1183,7 +1187,7 @@ const SFENTRY	*tblterm;
 
 	ret = STATFLAG_SUCCESS;
 	tbl = np2tbl;
-	tblterm = tbl + (sizeof(np2tbl)/sizeof(SFENTRY));
+	tblterm = tbl + NELEMENTS(np2tbl);
 	while(tbl < tblterm) {
 		ret |= statflag_createsection(sffh, tbl);
 		switch(tbl->type) {
@@ -1226,9 +1230,11 @@ const SFENTRY	*tblterm;
 				ret |= flagsave_ext(&sffh->sfh, tbl);
 				break;
 
+#if !defined(DISABLE_SOUND)
 			case STATFLAG_FM:
 				ret |= flagsave_fm(&sffh->sfh, tbl);
 				break;
+#endif
 
 			case STATFLAG_GIJ:
 				ret |= flagsave_gij(&sffh->sfh, tbl);
@@ -1268,7 +1274,7 @@ const SFENTRY	*tblterm;
 	while((!done) && (ret != STATFLAG_FAILURE)) {
 		ret |= statflag_readsection(sffh);
 		tbl = np2tbl;
-		tblterm = tbl + (sizeof(np2tbl)/sizeof(SFENTRY));
+		tblterm = tbl + NELEMENTS(np2tbl);
 		while(tbl < tblterm) {
 			if (!memcmp(sffh->sfh.hdr.index, tbl->index, 10)) {
 				break;
@@ -1296,7 +1302,9 @@ const SFENTRY	*tblterm;
 				case STATFLAG_EVT:
 				case STATFLAG_EXT:
 				case STATFLAG_GIJ:
+#if !defined(DISABLE_SOUND)
 				case STATFLAG_FM:
+#endif
 #if defined(SUPPORT_HOSTDRV)
 				case STATFLAG_HDRV:
 #endif
@@ -1366,7 +1374,7 @@ const SFENTRY	*tblterm;
 	while((!done) && (ret != STATFLAG_FAILURE)) {
 		ret |= statflag_readsection(sffh);
 		tbl = np2tbl + 1;
-		tblterm = np2tbl + (sizeof(np2tbl)/sizeof(SFENTRY));
+		tblterm = np2tbl + NELEMENTS(np2tbl);
 		while(tbl < tblterm) {
 			if (!memcmp(sffh->sfh.hdr.index, tbl->index, 10)) {
 				break;
@@ -1417,9 +1425,11 @@ const SFENTRY	*tblterm;
 					ret |= flagload_ext(&sffh->sfh, tbl);
 					break;
 
+#if !defined(DISABLE_SOUND)
 				case STATFLAG_FM:
 					ret |= flagload_fm(&sffh->sfh, tbl);
 					break;
+#endif
 
 				case STATFLAG_GIJ:
 					ret |= flagload_gij(&sffh->sfh, tbl);