--- xmil/vram/scrndraw.c 2004/08/04 15:18:26 1.2 +++ xmil/vram/scrndraw.c 2004/08/17 12:30:41 1.7 @@ -3,8 +3,8 @@ #include "sysmng.h" #include "scrndraw.h" #include "sdraw.h" -#include "draw.h" #include "palettes.h" +#include "makescrn.h" SCRN scrn; @@ -27,11 +27,11 @@ static void updateallline(UINT32 update) void scrndraw_initialize(void) { // ddraws_init ZeroMemory(screenmap, sizeof(screenmap)); - ZeroMemory(x1n_pal32, sizeof(x1n_pal32)); + ZeroMemory(xmil_pal32, sizeof(xmil_pal32)); + xmil_palettes = 0; scrn.widthmode = SCRNWIDTHMODE_WIDTH40; - xm_palettes = 0; updateallline(0x03030303); // updateallline(0x01010101); scrnmng_allflash(); sysmng_scrnwidth(scrn.widthmode); @@ -55,11 +55,6 @@ void scrndraw_changepalette(void) { return; } #endif -#if defined(SUPPORT_16BPP) - if (scrnmng_getbpp() == 16) { - pals_cnv16pal(x1n_pal16, x1n_pal32, xm_palettes); - } -#endif updateallline(0x01010101); // fillrenewalline(0x03030303) } @@ -71,6 +66,10 @@ const SDRAWFN *sdrawfn; _SDRAW sdraw; UINT i; + if (redraw) { + updateallline(0x01010101); + } + surf = scrnmng_surflock(); if (surf == NULL) { goto sddr_exit1; @@ -123,9 +122,7 @@ sddr_exit1: void scrndraw_redraw(void) { scrnmng_allflash(); - scrnmng_palchanged(); // ? - updateallline(0x01010101); // fillrenewalline(0x03030303) - palettes(); - scrndraw_draw(FALSE); + pal_update(); + scrndraw_draw(TRUE); }