--- xmil/vram/make15.c 2004/08/08 09:12:06 1.3 +++ xmil/vram/make15.c 2004/08/10 08:28:49 1.4 @@ -8,10 +8,6 @@ #include "font.h" -extern BYTE dispflg; -extern BYTE *dispp; - - void width80x25_200l(void) { // 80x25 200line UINT fontcy; @@ -36,13 +32,13 @@ void width80x25_200l(void) { // 8 x = makescrn.surfcx; do { udtmp = updatetmp[pos]; - if (udtmp & dispflg) { - updatetmp[pos] = (UINT8)(udtmp & (~dispflg)); + if (udtmp & makescrn.dispflag) { + updatetmp[pos] = (UINT8)(udtmp & (~makescrn.dispflag)); newline = TRUE; ZeroMemory(work, sizeof(work)); makechr8(work, pos, fontcy, udtmp); makemix_mix(dst, SURFACE_WIDTH * 2, - work, dispp + (pos << 5), fontcy); + work, makescrn.disp1 + (pos << 5), fontcy); makemix_doubler(dst, fontcy, 0x40404040); if (fontcy < makescrn.fontcy) { makemix_remcpy(dst, fontcy * 2, makescrn.fontcy * 2); @@ -97,12 +93,12 @@ const UINT8 *src; x = makescrn.surfcx; do { udtmp = updatetmp[pos]; - if (udtmp & dispflg) { - updatetmp[pos] = (UINT8)(udtmp & (~dispflg)); + if (udtmp & makescrn.dispflag) { + updatetmp[pos] = (UINT8)(udtmp & (~makescrn.dispflag)); newline = TRUE; ZeroMemory(work, sizeof(work)); makechr16(work, pos, fontcy, udtmp); - src = dispp + (LOW10(pos) << 5); + src = makescrn.disp1 + (LOW10(pos) << 5); makemix_mix(dst, SURFACE_WIDTH * 4, work, src, fontcy); makemix_mix(dst + SURFACE_WIDTH * 2, SURFACE_WIDTH * 4, work + MAKETEXT_STEP, src + GRAM_HALFSTEP, fontcy);