--- np2/statsave.tbl	2003/12/05 09:46:15	1.9
+++ np2/statsave.tbl	2003/12/21 16:05:25	1.11
@@ -63,7 +63,7 @@ static const PROCTBL dmaproc[] = {
 			{PROCID('d','m','e','c'), cs4231dmafunc}};
 
 static const STENTRY np2tbl[] = {
-	{"CPU286",		0,	NP2FLAG_CLOCK,	&i286core.s,	sizeof(i286core.s)},
+	{"CPU286",		0,	NP2FLAG_CLOCK,	&CPU_STATSAVE,	sizeof(CPU_STATSAVE)},
 #if 1	// ver0.72
 	{"MEMORY",		0,	NP2FLAG_MEM,	NULL,			0x130000},
 #else
@@ -76,7 +76,11 @@ static const STENTRY np2tbl[] = {
 	{"CORE",		0,	NP2FLAG_CLOCK,	&pc,			sizeof(pc)},
 	{"ARTIC",		0,	NP2FLAG_BIN,	&artic,			sizeof(artic)},
 	{"CGROM",		0,	NP2FLAG_BIN,	&cgrom,			sizeof(cgrom)},
+#if !defined(CGWND_FONTPTR)
 	{"CGWINDOW",	0,	NP2FLAG_BIN,	&cgwindow,		sizeof(cgwindow)},
+#else
+	{"CGWINDOW",	0,	NP2FLAG_CGW,	&cgwindow,		sizeof(cgwindow)},
+#endif
 	{"CRTC",		0,	NP2FLAG_BIN,	&grcg,			sizeof(grcg)},
 	{"CRTC2",		0,	NP2FLAG_BIN,	&crtc,			sizeof(crtc)},
 	{"DMAC",		0,	NP2FLAG_DMA,	&dmac,			sizeof(dmac)},