--- np2/win9x/Attic/np2info.cpp 2004/01/13 05:30:59 1.5 +++ np2/win9x/Attic/np2info.cpp 2004/01/25 05:41:29 1.7 @@ -41,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 @@ -99,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); @@ -120,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); } @@ -139,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);