--- np2/win9x/Attic/np2info.cpp	2003/10/16 17:58:54	1.1.1.1
+++ np2/win9x/Attic/np2info.cpp	2004/01/25 05:41:29	1.7
@@ -2,14 +2,13 @@
 #include	"strres.h"
 #include	"np2.h"
 #include	"scrnmng.h"
-#include	"i286.h"
-#include	"memory.h"
+#include	"np2info.h"
+#include	"cpucore.h"
 #include	"pccore.h"
 #include	"iocore.h"
 #include	"bios.h"
 #include	"sound.h"
 #include	"fmboard.h"
-#include	"np2info.h"
 
 
 static const char str_2halfMHz[] = "2.5MHz";
@@ -42,8 +41,6 @@ static const char str_egc[] = "EGC CG-Wi
 static const char *grcgchip[4] = {str_null, str_grcg, str_grcgcgwin, str_egc};
 
 
-extern	int		usesound;
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -69,7 +66,7 @@ static void info_ver(char *str, int maxl
 
 static void info_cpu(char *str, int maxlen) {
 
-	milstr_ncpy(str, (CPUTYPE & CPUTYPE_V30)?str_V30:str_i286, maxlen);
+	milstr_ncpy(str, (CPU_TYPE & CPUTYPE_V30)?str_V30:str_i286, maxlen);
 }
 
 static void info_clock(char *str, int maxlen) {
@@ -77,14 +74,14 @@ static void info_clock(char *str, int ma
 	UINT32	clock;
 	char	clockstr[16];
 
-	clock = (pc.realclock + 50000) / 100000;
+	clock = (pccore.realclock + 50000) / 100000;
 	SPRINTF(clockstr, str_clockfmt, clock/10, clock % 10);
 	milstr_ncpy(str, clockstr, maxlen);
 }
 
 static void info_base(char *str, int maxlen) {
 
-	milstr_ncpy(str, (pc.baseclock == PCBASECLOCK25)?str_5MHz:str_8MHz,
+	milstr_ncpy(str, (pccore.baseclock == PCBASECLOCK25)?str_5MHz:str_8MHz,
 																	maxlen);
 }
 
@@ -100,8 +97,8 @@ static void info_mem1(char *str, int max
 	else {
 		memsize = 640;
 	}
-	if (extmem.maxmem > 1) {
-		SPRINTF(memstr, str_memfmt2, memsize, (extmem.maxmem - 1) * 1024);
+	if (pccore.extmem) {
+		SPRINTF(memstr, str_memfmt2, memsize, pccore.extmem * 1024);
 	}
 	else {
 		SPRINTF(memstr, str_memfmt, memsize);
@@ -121,9 +118,7 @@ static void info_mem2(char *str, int max
 	else {
 		memsize = 640;
 	}
-	if (extmem.maxmem > 1) {
-		memsize += (extmem.maxmem - 1) * 1024;
-	}
+	memsize += pccore.extmem * 1024;
 	SPRINTF(memstr, str_memfmt, memsize);
 	milstr_ncpy(str, memstr, maxlen);
 }
@@ -140,8 +135,8 @@ static void info_mem3(char *str, int max
 	else {
 		memsize = 640;
 	}
-	if (extmem.maxmem > 1) {
-		SPRINTF(memstr, str_memfmt3, extmem.maxmem - 1, memsize / 100);
+	if (pccore.extmem > 1) {
+		SPRINTF(memstr, str_memfmt3, pccore.extmem, memsize / 100);
 	}
 	else {
 		SPRINTF(memstr, str_memfmt, memsize);