--- xmil/vram/scrndraw.c	2004/08/17 16:52:46	1.9
+++ xmil/vram/scrndraw.c	2005/02/04 06:42:12	1.12
@@ -1,6 +1,5 @@
 #include	"compiler.h"
 #include	"scrnmng.h"
-#include	"sysmng.h"
 #include	"pccore.h"
 #include	"iocore.h"
 #include	"scrndraw.h"
@@ -9,7 +8,6 @@
 #include	"makescrn.h"
 
 
-	SCRN	scrn;
 	UINT8	renewalline[SURFACE_HEIGHT+4];
 	UINT8	screenmap[SURFACE_SIZE];
 
@@ -32,20 +30,8 @@ void scrndraw_initialize(void) {					// 
 	ZeroMemory(xmil_pal32, sizeof(xmil_pal32));
 	xmil_palettes = 0;
 
-	scrn.widthmode = SCRNWIDTHMODE_WIDTH40;
-
 	updateallline(0x03030303);			// updateallline(0x01010101);
 	scrnmng_allflash();
-	sysmng_scrnwidth(scrn.widthmode);
-}
-
-void scrndraw_changewidth(REG8 widthmode) {
-
-	if (scrn.widthmode != widthmode) {
-		scrn.widthmode = widthmode;
-		sysmng_scrnwidth(widthmode);
-		updateallline(0x01010101);				// fillrenewalline(0x03030303)
-	}
 }
 
 void scrndraw_changepalette(void) {
@@ -53,7 +39,6 @@ void scrndraw_changepalette(void) {
 #if defined(SUPPORT_8BPP)
 	if (scrnmng_getbpp() == 8) {
 		scrnmng_palchanged();
-		updateallline(0x01010101);				// fillrenewalline(0x02020202)
 		return;
 	}
 #endif
@@ -115,7 +100,7 @@ static REG8 rasterdraw(SDRAWFN sdrawfn, 
 		for (y=0; y<nextupdate; y+=2) {
 			*(UINT16 *)(renewalline + y) |= 0x0101;
 		}
-		return(1);
+		return(SCRNUPD_FLASH);
 	}
 	else {
 		return(0);
@@ -148,19 +133,7 @@ const SDRAWFN	*sdrawfn;
 	if (sdrawfn == NULL) {
 		goto sddr_exit2;
 	}
-	switch(scrn.widthmode) {
-		case SCRNWIDTHMODE_WIDTH80:
-		default:
-			break;
-
-		case SCRNWIDTHMODE_WIDTH40:
-			sdrawfn += 1;
-			break;
-
-		case SCRNWIDTHMODE_4096:
-			sdrawfn += 2;
-			break;
-	}
+	sdrawfn += makescrn.drawmode;
 	fn = *sdrawfn;
 	if (fn == NULL) {
 		goto sddr_exit2;
@@ -175,15 +148,19 @@ const SDRAWFN	*sdrawfn;
 
 	sdraw.src = screenmap;
 	sdraw.dst = surf->ptr;
+#if defined(SIZE_QVGA)
+	sdraw.width = surf->width >> 1;
+#else
 	sdraw.width = surf->width;
-	sdraw.xbytes = surf->xalign * surf->width;
+#endif
+	sdraw.xbytes = surf->xalign * sdraw.width;
 	sdraw.y = 0;
 	sdraw.xalign = surf->xalign;
 	sdraw.yalign = surf->yalign;
 #if !defined(SUPPORT_PALEVENT)
 	(*fn)(&sdraw, 400);
 #else
-	if (((crtc.e.dispmode & SCRN64_MASK) != SCRN64_INVALID) ||
+	if ((crtc.e.dispmode & SCRN64_ENABLE) ||
 		(palevent.events >= SUPPORT_PALEVENT)) {
 		(*fn)(&sdraw, 400);
 	}