--- np2/macosx/Attic/np2info.cpp 2004/01/13 05:30:58 1.4 +++ np2/macosx/Attic/np2info.cpp 2004/01/31 19:45:25 1.6 @@ -40,8 +40,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 @@ -98,8 +96,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 (emsio.maxmem > 1) { + SPRINTF(memstr, str_memfmt2, memsize, (emsio.maxmem - 1) * 1024); } else { SPRINTF(memstr, str_memfmt, memsize); @@ -119,8 +117,8 @@ static void info_mem2(char *str, int max else { memsize = 640; } - if (extmem.maxmem > 1) { - memsize += (extmem.maxmem - 1) * 1024; + if (emsio.maxmem > 1) { + memsize += (emsio.maxmem - 1) * 1024; } SPRINTF(memstr, str_memfmt, memsize); milstr_ncpy(str, memstr, maxlen); @@ -138,8 +136,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 (emsio.maxmem > 1) { + SPRINTF(memstr, str_memfmt3, emsio.maxmem - 1, memsize / 100); } else { SPRINTF(memstr, str_memfmt, memsize);