--- np2/vram/maketext.c 2004/02/07 21:23:22 1.6 +++ np2/vram/maketext.c 2004/02/18 21:58:41 1.8 @@ -14,12 +14,7 @@ static UINT32 text_table[512]; static UINT32 text_tblx2[512][2]; -void maketext_reset(void) { - - ZeroMemory(&tramflag, sizeof(tramflag)); -} - -void maketext_init(void) { +void maketext_initialize(void) { int i; int j; @@ -67,6 +62,11 @@ void maketext_init(void) { } } +void maketext_reset(void) { + + ZeroMemory(&tramflag, sizeof(tramflag)); +} + static BYTE dirtyonblink(void) { BYTE ret; @@ -159,7 +159,7 @@ void maketext(int text_renewal) { tramflag.gaiji = 0; } - multiple = ((!(gdc.mode1 & 8)) && (!gdc.crt15khz))?0x20:0x00; + multiple = ((!(gdc.mode1 & 8)) && (!(gdc.crt15khz & 1)))?0x20:0x00; TEXT_LR = gdc.m.para[GDC_CSRFORM] & 0x1f; TEXT_PL = crtc.reg.pl; TEXT_BL = crtc.reg.bl + 1; @@ -470,7 +470,7 @@ void maketext40(int text_renewal) { tramflag.gaiji = 0; } - multiple = ((!(gdc.mode1 & 8)) && (!gdc.crt15khz))?0x20:0x00; + multiple = ((!(gdc.mode1 & 8)) && (!(gdc.crt15khz & 1)))?0x20:0x00; TEXT_LR = gdc.m.para[GDC_CSRFORM] & 0x1f; TEXT_PL = crtc.reg.pl; TEXT_BL = crtc.reg.bl + 1;