--- np2/statsave.c	2003/12/05 09:46:15	1.18
+++ np2/statsave.c	2003/12/19 23:16:06	1.21
@@ -4,8 +4,7 @@
 #include	"scrnmng.h"
 #include	"soundmng.h"
 #include	"timemng.h"
-#include	"i286.h"
-#include	"memory.h"
+#include	"cpucore.h"
 #include	"pccore.h"
 #include	"iocore.h"
 #include	"cbuscore.h"
@@ -408,8 +407,8 @@ static int flagsave_ext(NP2FFILE f, cons
 	ret = flagsave_create(f, t);
 	if (ret != NP2FLAG_FAILURE) {
 		ret |= flagsave_save(f, &extmem, sizeof(extmem));
-		if (extmemmng_size) {
-			ret |= flagsave_save(f, extmemmng_ptr, extmemmng_size);
+		if (CPU_EXTMEM) {
+			ret |= flagsave_save(f, CPU_EXTMEM, CPU_EXTMEMSIZE);
 		}
 		ret |= flagsave_close(f);
 	}
@@ -429,8 +428,8 @@ static int flagload_ext(NP2FFILE f, cons
 		}
 		if (!extmemmng_realloc(extmem.maxmem - 1)) {
 			pagemax = (extmem.maxmem - 1) << 8;
-			if (extmemmng_size) {
-				ret |= flagload_load(f, extmemmng_ptr, extmemmng_size);
+			if (CPU_EXTMEM) {
+				ret |= flagload_load(f, CPU_EXTMEM, CPU_EXTMEMSIZE);
 			}
 		}
 		else {
@@ -439,7 +438,7 @@ static int flagload_ext(NP2FFILE f, cons
 	}
 	for (i=0; i<4; i++) {
 		if (extmem.page[i] < pagemax) {
-			extmem.pageptr[i] = extmemmng_ptr + (extmem.page[i] << 12);
+			extmem.pageptr[i] = CPU_EXTMEM + (extmem.page[i] << 12);
 		}
 		else {
 			extmem.pageptr[i] = mem + 0xc0000 + (i << 14);
@@ -1499,6 +1498,10 @@ const STENTRY	*tblterm;
 	gdcs.palchange = GDCSCRN_REDRAW;
 	tramflag.renewal = 1;
 	cgwindow.writable |= 0x80;
+#if defined(CPUSTRUC_FONTPTR)
+	FONTPTR_LOW = fontrom + cgwindow.low;
+	FONTPTR_HIGH = fontrom + cgwindow.high;
+#endif
 	i286_vram_dispatch(vramop.operate);
 	soundmng_play();