--- xmil/statsave.c	2004/08/14 12:16:17	1.4
+++ xmil/statsave.c	2008/06/02 20:07:30	1.8
@@ -15,11 +15,7 @@
 #include	"palettes.h"
 #include	"makescrn.h"
 #include	"sound.h"
-// #include	"sndctrl.h"
-// #include	"font.h"
 #include	"fddfile.h"
-// #include	"fdd_mtr.h"
-
 
 #if defined(MACOS)
 #define	CRCONST		str_cr
@@ -64,9 +60,9 @@ typedef struct {
 #include "statsave.tbl"
 
 
-// ----
+/* ---- */
 
-// 関数ポインタを intに変更。
+/* 関数ポインタを intに変更。 */
 static UINT32 proc2id(INTPTR func, const PROCTBL *tbl, UINT count) {
 
 	while(count) {
@@ -92,7 +88,7 @@ static INTPTR id2proc(UINT32 id, const P
 }
 
 
-// ----
+/* ---- */
 
 enum {
 	SFFILEH_WRITE	= 0x0001,
@@ -324,7 +320,7 @@ void statflag_seterr(STFLAGH sfh, const 
 }
 
 
-// ---- common
+/* common */
 
 static int flagsave_common(STFLAGH sfh, const SFENTRY *tbl) {
 
@@ -337,138 +333,94 @@ static int flagload_common(STFLAGH sfh, 
 }
 
 
-// ---- event
+/* event */
 
 typedef struct {
+	UINT32	next;
 	SINT32	clock;
-	SINT32	base;
-	UINT32	param;
+	SINT32	baseclock;
 	UINT32	proc;
 } NEVTITEM;
 
 typedef struct {
-	UINT	readys;
-	UINT	events;
-	UINT32	ready[NEVENT_MAXEVENTS];
-	UINT32	event[NEVENT_MAXEVENTS];
+	NEVTITEM	item[NEVENT_MAXEVENTS];
+	UINT32		first;
 } NEVTSAVE;
 
-static UINT32 evt2id(UINT evt) {
-
-	UINT	i;
+static UINT32 evt2id(NEVENTITEM next) {
 
-	for (i=0; i<sizeof(evtnum)/sizeof(ENUMTBL); i++) {
-		if (evtnum[i].evt == evt) {
-			return(evtnum[i].id);
-		}
+	if (next == NEVENTITEM_NONE) {
+		return((UINT32)-2);
+	}
+	else if (next == NEVENTITEM_TERM) {
+		return((UINT32)-1);
+	}
+	else {
+		return(next - nevent.item);
 	}
-	return(0);
 }
 
-static int nevent_write(STFLAGH sfh, const _NEVENTITEM *ne) {
-
-	NEVTITEM	nit;
+static NEVENTITEM id2evt(UINT32 n) {
 
-	nit.clock = ne->clock;
-	nit.base = ne->baseclock;
-	nit.proc = proc2id((INTPTR)ne->proc, evtproc, NELEMENTS(evtproc));
-	nit.param = ne->param;
-	return(statflag_write(sfh, &nit, sizeof(nit)));
+	if (n == (UINT32)-2) {
+		return(NEVENTITEM_NONE);
+	}
+	else if (n == (UINT32)-1) {
+		return(NEVENTITEM_TERM);
+	}
+	else if (n < NEVENT_MAXEVENTS) {
+		return(nevent.item + n);
+	}
+	else {
+		/* error! */
+		return(NEVENTITEM_TERM);
+	}
 }
 
 static int flagsave_evt(STFLAGH sfh, const SFENTRY *tbl) {
 
 	NEVTSAVE	nevt;
 	UINT		i;
-	UINT32		id;
-	UINT		eventid[NEVENT_MAXEVENTS];
-	int			ret;
 
-	ZeroMemory(&nevt, sizeof(nevt));
-	for (i=0; i<nevent.readyevents; i++) {
-		id = evt2id(nevent.level[i]);
-		if (id) {
-			nevt.ready[nevt.readys++] = id;
-		}
-	}
 	for (i=0; i<NEVENT_MAXEVENTS; i++) {
-		id = evt2id(i);
-		if (id) {
-			eventid[i] = i;
-			nevt.event[nevt.events++] = id;
-		}
-	}
-	ret = statflag_write(sfh, &nevt, sizeof(nevt));
-	for (i=0; i<nevt.events; i++) {
-		ret |= nevent_write(sfh, nevent.item + eventid[i]);
+		nevt.item[i].next = evt2id(nevent.item[i].next);
+		nevt.item[i].clock = nevent.item[i].clock;
+		nevt.item[i].baseclock = nevent.item[i].baseclock;
+		nevt.item[i].proc = proc2id((INTPTR)nevent.item[i].proc,
+												evtproc, NELEMENTS(evtproc));
 	}
+	nevt.first = evt2id(nevent.first);
 	(void)tbl;
-	return(ret);
-}
-
-static UINT id2evt(UINT32 id) {
-
-	UINT	i;
-
-	for (i=0; i<sizeof(evtnum)/sizeof(ENUMTBL); i++) {
-		if (evtnum[i].id == id) {
-			return(evtnum[i].evt);
-		}
-	}
-	return(NEVENT_MAXEVENTS);
-}
-
-static int nevent_read(STFLAGH sfh, UINT32 id) {
-
-	int			ret;
-	NEVTITEM	nit;
-	UINT		evt;
-	_NEVENTITEM	*ne;
-
-	ret = statflag_read(sfh, &nit, sizeof(nit));
-	evt = id2evt(id);
-	if (evt >= NEVENT_MAXEVENTS) {
-		return(STATFLAG_FAILURE);
-	}
-	ne = nevent.item + evt;
-	ne->clock = nit.clock;
-	ne->baseclock = nit.base;
-	ne->proc = (NEVENTCB)id2proc(nit.proc, evtproc, NELEMENTS(evtproc));
-	ne->param = nit.param;
-	return(ret);
+	return(statflag_write(sfh, &nevt, sizeof(nevt)));
 }
 
 static int flagload_evt(STFLAGH sfh, const SFENTRY *tbl) {
 
-	int			ret;
 	NEVTSAVE	nevt;
+	int			ret;
 	UINT		i;
-	UINT		evt;
-	UINT		readyevents;
 
 	ret = statflag_read(sfh, &nevt, sizeof(nevt));
 
-	readyevents = 0;
-	for (i=0; i<nevt.readys; i++) {
-		evt = id2evt(nevt.ready[i]);
-		if (evt < NEVENT_MAXEVENTS) {
-			nevent.level[readyevents++] = evt;
-		}
-	}
-	nevent.readyevents = readyevents;
-	for (i=0; i<nevt.events; i++) {
-		ret |= nevent_read(sfh, nevt.event[i]);
+	for (i=0; i<NEVENT_MAXEVENTS; i++) {
+		nevent.item[i].next = id2evt(nevt.item[i].next);
+		nevent.item[i].clock = nevt.item[i].clock;
+		nevent.item[i].baseclock = nevt.item[i].baseclock;
+		nevent.item[i].proc = (NEVENTCB)id2proc(nevt.item[i].proc,
+												evtproc, NELEMENTS(evtproc));
 	}
+	nevent.first = id2evt(nevt.first);
 	(void)tbl;
 	return(ret);
 }
 
 
-// ---- disk
+/* disk */
 
 typedef struct {
-	OEMCHAR	path[MAX_PATH];
-	int		readonly;
+	OEMCHAR	fname[MAX_PATH];
+	UINT32	ftype;
+	UINT	readonly;
 	DOSDATE	date;
 	DOSTIME	time;
 } STATDISK;
@@ -477,16 +429,17 @@ static const OEMCHAR str_fddx[] = OEMTEX
 static const OEMCHAR str_updated[] = OEMTEXT("%s: updated");
 static const OEMCHAR str_notfound[] = OEMTEXT("%s: not found");
 
-static int disksave(STFLAGH sfh, const OEMCHAR *path, int readonly) {
+static int disksave(STFLAGH sfh, const _FDDFILE *fdd) {
 
 	STATDISK	st;
 	FILEH		fh;
 
 	ZeroMemory(&st, sizeof(st));
-	if ((path) && (path[0])) {
-		file_cpyname(st.path, path, sizeof(st.path));
-		st.readonly = readonly;
-		fh = file_open_rb(path);
+	if (fdd->type != DISKTYPE_NOTREADY) {
+		file_cpyname(st.fname, fdd->fname, NELEMENTS(st.fname));
+		st.ftype = fdd->ftype;
+		st.readonly = fdd->protect;
+		fh = file_open_rb(st.fname);
 		if (fh != FILEH_INVALID) {
 			file_getdatetime(fh, &st.date, &st.time);
 			file_close(fh);
@@ -501,8 +454,8 @@ static int flagsave_disk(STFLAGH sfh, co
 	REG8	i;
 
 	ret = STATFLAG_SUCCESS;
-	for (i=0; i<4; i++) {
-		ret |= disksave(sfh, fddfile_diskname(i), fddfile_diskprotect(i));
+	for (i=0; i<MAX_FDDFILE; i++) {
+		ret |= disksave(sfh, fddfile + i);
 	}
 	(void)tbl;
 	return(ret);
@@ -518,8 +471,8 @@ static int diskcheck(STFLAGH sfh, const 
 	DOSTIME		time;
 
 	ret = statflag_read(sfh, &st, sizeof(st));
-	if (st.path[0]) {
-		fh = file_open_rb(st.path);
+	if (st.fname[0]) {
+		fh = file_open_rb(st.fname);
 		if (fh != FILEH_INVALID) {
 			file_getdatetime(fh, &date, &time);
 			file_close(fh);
@@ -546,7 +499,7 @@ static int flagcheck_disk(STFLAGH sfh, c
 	OEMCHAR	buf[8];
 
 	ret = 0;
-	for (i=0; i<4; i++) {
+	for (i=0; i<MAX_FDDFILE; i++) {
 		OEMSPRINTF(buf, str_fddx, i+1);
 		ret |= diskcheck(sfh, buf);
 	}
@@ -561,10 +514,10 @@ static int flagload_disk(STFLAGH sfh, co
 	STATDISK	st;
 
 	ret = STATFLAG_SUCCESS;
-	for (i=0; i<4; i++) {
+	for (i=0; i<MAX_FDDFILE; i++) {
 		ret |= statflag_read(sfh, &st, sizeof(st));
-		if (st.path[0]) {
-			fddfile_set(i, st.path, FTYPE_NONE, st.readonly);
+		if (st.fname[0]) {
+			fddfile_set(i, st.fname, st.ftype, st.readonly);
 		}
 	}
 	(void)tbl;
@@ -572,7 +525,7 @@ static int flagload_disk(STFLAGH sfh, co
 }
 
 
-// ----
+/* checker */
 
 static int flagcheck_versize(STFLAGH sfh, const SFENTRY *tbl) {
 
@@ -591,7 +544,7 @@ static int flagcheck_veronly(STFLAGH sfh
 }
 
 
-// ----
+/* interface */
 
 int statsave_save(const OEMCHAR *filename) {
 
@@ -634,7 +587,7 @@ int statsave_check(const OEMCHAR *filena
 
 	SFFILEH		sffh;
 	int			ret;
-	BOOL		done;
+	BRESULT		done;
 const SFENTRY	*tbl;
 const SFENTRY	*tblterm;
 
@@ -690,7 +643,7 @@ int statsave_load(const OEMCHAR *filenam
 
 	SFFILEH		sffh;
 	int			ret;
-	BOOL		done;
+	BRESULT		done;
 const SFENTRY	*tbl;
 const SFENTRY	*tblterm;
 
@@ -699,7 +652,7 @@ const SFENTRY	*tblterm;
 		return(STATFLAG_FAILURE);
 	}
 
-	// PCCORE read!
+	/* PCCORE read! */
 	ret = statflag_readsection(sffh);
 	if ((ret != STATFLAG_SUCCESS) ||
 		(memcmp(sffh->sfh.hdr.index, xmiltbl[0].index, 10))) {