--- np2/statsave.c	2003/10/16 17:57:09	1.1
+++ np2/statsave.c	2003/10/20 06:36:33	1.7
@@ -43,8 +43,7 @@ typedef struct {
 enum {
 	NP2FLAG_BIN			= 0,
 	NP2FLAG_TERM,
-	NP2FLAG_286,
-	NP2FLAG_CORE,
+	NP2FLAG_CLOCK,
 	NP2FLAG_DMA,
 	NP2FLAG_EGC,
 	NP2FLAG_EXT,
@@ -350,43 +349,12 @@ static int flagload_common(NP2FFILE *f, 
 
 // -----
 
-static int flagsave_286(NP2FFILE *f, const STENTRY *t) {
-
-	int		ret;
-
-	ret = flagsave_create(f, t);
-	if (ret != NP2FLAG_FAILURE) {
-		ret |= flagsave_save(f, &i286r, sizeof(I286REGS));
-		ret |= flagsave_save(f, &i286s, sizeof(I286STAT));
-		ret |= flagsave_close(f);
-	}
-	return(ret);
-}
-
-static int flagload_286(NP2FFILE *f, const STENTRY *t) {
-
-	int		ret;
-
-	ret = flagload_load(f, &i286r, sizeof(I286REGS));
-	ret |= flagload_load(f, &i286s, sizeof(I286STAT));
-	(void)t;
-	return(ret);
-}
-
-
-// -----
-
-static int flagload_core(NP2FFILE *f, const STENTRY *t) {
+static int flagload_clock(NP2FFILE *f, const STENTRY *t) {
 
 	int		ret;
 
 	ret = flagload_common(f, t);
-	if (opna_rate) {
-		pc.sampleclock = (pc.realclock / opna_rate) + 1;
-	}
-	else {
-		pc.sampleclock = 0;
-	}
+	sound_changeclock();
 	return(ret);
 }
 
@@ -526,9 +494,6 @@ static int flagload_ext(NP2FFILE *f, con
 // -----
 
 typedef struct {
-	SINT32		remainclock;
-	SINT32		baseclock;
-	UINT32		clock;
 	UINT		readyevents;
 	UINT		waitevents;
 } NEVTSAVE;
@@ -543,7 +508,7 @@ typedef struct {
 static int nevent_save(NP2FFILE *f, int num) {
 
 	NEVTITEM	nit;
-	int			i;
+	UINT		i;
 
 	ZeroMemory(&nit, sizeof(nit));
 	for (i=0; i<sizeof(evtnum)/sizeof(ENUMTBL); i++) {
@@ -567,9 +532,6 @@ static int flagsave_evt(NP2FFILE *f, con
 	int			ret;
 	UINT		i;
 
-	nevt.remainclock = nevent.remainclock;
-	nevt.baseclock = nevent.baseclock;
-	nevt.clock = nevent.clock;
 	nevt.readyevents = nevent.readyevents;
 	nevt.waitevents = nevent.waitevents;
 
@@ -628,9 +590,6 @@ static int flagload_evt(NP2FFILE *f, con
 
 	ret = flagload_load(f, &nevt, sizeof(nevt));
 
-	nevent.remainclock = nevt.remainclock;
-	nevent.baseclock = nevt.baseclock;
-	nevent.clock = nevt.clock;
 	nevent.readyevents = 0;
 	nevent.waitevents = 0;
 
@@ -769,7 +728,7 @@ static int flagsave_fm(NP2FFILE *f, cons
 		if (saveflg & FLAG_FM1A) {
 			ret |= flagsave_save(f, &fmtimer, sizeof(fmtimer));
 			ret |= flagsave_save(f, &opn, sizeof(opn));
-			CopyMemory(opnkey.keyreg, fm_keyreg, sizeof(fm_keyreg));
+			CopyMemory(opnkey.keyreg, opngen.keyreg, sizeof(opngen.keyreg));
 			opnkey.extop[0] = opnch[2].extop;
 			opnkey.extop[1] = opnch[5].extop;
 			opnkey.extop[2] = opnch[8].extop;
@@ -811,7 +770,7 @@ static void play_fmreg(BYTE num) {
 		opngen_setreg((BYTE)chbase, (BYTE)i, opn.reg[reg + i]);
 	}
 	for (i=0; i<3; i++) {
-		opngen_keyon(chbase + i, fm_keyreg[chbase + i]);
+		opngen_keyon(chbase + i, opngen.keyreg[chbase + i]);
 	}
 }
 
@@ -894,7 +853,7 @@ static int flagload_fm(NP2FFILE *f, cons
 		ret |= flagload_load(f, &fmtimer, sizeof(fmtimer));
 		ret |= flagload_load(f, &opn, sizeof(opn));
 		ret |= flagload_load(f, &opnkey, sizeof(opnkey));
-		CopyMemory(fm_keyreg, &opnkey.keyreg, sizeof(fm_keyreg));
+		CopyMemory(opngen.keyreg, &opnkey.keyreg, sizeof(opngen.keyreg));
 		opnch[2].extop = opnkey.extop[0];
 		opnch[5].extop = opnkey.extop[1];
 		opnch[8].extop = opnkey.extop[2];
@@ -1192,7 +1151,7 @@ int statsave_save(const char *filename) 
 
 	NP2FFILE	f;
 	int			ret;
-	int			i;
+	UINT		i;
 
 	ret = flagcreate(&f, filename);
 	if (ret == NP2FLAG_FAILURE) {
@@ -1201,7 +1160,7 @@ int statsave_save(const char *filename) 
 	for (i=0; i<sizeof(np2tbl)/sizeof(STENTRY); i++) {
 		switch(np2tbl[i].type) {
 			case NP2FLAG_BIN:
-			case NP2FLAG_CORE:
+			case NP2FLAG_CLOCK:
 			case NP2FLAG_BEEP:
 				ret |= flagsave_common(&f, &np2tbl[i]);
 				break;
@@ -1210,10 +1169,6 @@ int statsave_save(const char *filename) 
 				ret |= flagsave_term(&f, &np2tbl[i]);
 				break;
 
-			case NP2FLAG_286:
-				ret |= flagsave_286(&f, &np2tbl[i]);
-				break;
-
 			case NP2FLAG_DMA:
 				ret |= flagsave_dma(&f, &np2tbl[i]);
 				break;
@@ -1257,7 +1212,7 @@ int statsave_check(const char *filename,
 
 	NP2FFILE	f;
 	int			ret;
-	int			i;
+	UINT		i;
 	BOOL		done;
 	ERR_BUF		e;
 
@@ -1296,8 +1251,7 @@ int statsave_check(const char *filename,
 						done = TRUE;
 						break;
 
-					case NP2FLAG_286:
-					case NP2FLAG_CORE:
+					case NP2FLAG_CLOCK:
 					case NP2FLAG_DMA:
 					case NP2FLAG_EGC:
 					case NP2FLAG_EXT:
@@ -1339,7 +1293,7 @@ int statsave_load(const char *filename) 
 
 	NP2FFILE	f;
 	int			ret;
-	int			i;
+	UINT		i;
 	BOOL		done;
 
 	ret = flagopen(&f, filename, NULL);
@@ -1376,12 +1330,8 @@ int statsave_load(const char *filename) 
 					done = TRUE;
 					break;
 
-				case NP2FLAG_286:
-					ret |= flagload_286(&f, &np2tbl[i]);
-					break;
-
-				case NP2FLAG_CORE:
-					ret |= flagload_core(&f, &np2tbl[i]);
+				case NP2FLAG_CLOCK:
+					ret |= flagload_clock(&f, &np2tbl[i]);
 					break;
 
 				case NP2FLAG_DMA: