--- xmil/win9x/scrnmng.cpp	2004/08/01 05:31:31	1.1
+++ xmil/win9x/scrnmng.cpp	2004/08/04 17:09:25	1.4
@@ -15,8 +15,6 @@
 #include	"scrndraw.h"
 #include	"draw.h"
 #include	"palettes.h"
-#include	"x1_io.h"
-#include	"x1_crtc.h"
 
 
 typedef struct {
@@ -247,9 +245,9 @@ static void paletteinit(void) {
 		ddraw.pal[i].peFlags = PC_RESERVED | PC_NOCOLLAPSE;
 	}
 	for (i=0; i<4; i++) {
-		ddraw.pal[i+START_PAL+TOTAL_PALS].peBlue = dclock_pal[i].p.b;
-		ddraw.pal[i+START_PAL+TOTAL_PALS].peRed = dclock_pal[i].p.r;
-		ddraw.pal[i+START_PAL+TOTAL_PALS].peGreen = dclock_pal[i].p.g;
+		ddraw.pal[i+START_PAL+TOTAL_PALS].peBlue = dclockpal.pal32[i].p.b;
+		ddraw.pal[i+START_PAL+TOTAL_PALS].peRed = dclockpal.pal32[i].p.r;
+		ddraw.pal[i+START_PAL+TOTAL_PALS].peGreen = dclockpal.pal32[i].p.g;
 		ddraw.pal[i+START_PAL+TOTAL_PALS].peFlags = PC_RESERVED | PC_NOCOLLAPSE;
 	}
 	reflesh_palette();
@@ -473,7 +471,7 @@ BRESULT scrnmng_create(UINT8 mode) {
 	scrnmng.bpp = (UINT8)bitcolor;
 	scrnsurf.bpp = bitcolor;
 	ddraw.scrnmode = mode;
-	ddraw.width = SCREEN_WIDTH;
+	ddraw.width = SURFACE_WIDTH;
 	ddraw.height = height;
 	ddraw.cliping = 0;
 	renewalclientsize(FALSE);
@@ -642,8 +640,8 @@ void clearblanklines(DWORD posx, DWORD p
 
 	fillrect.left = posx;
 	fillrect.top = posy + ddraw.rect.bottom;
-	fillrect.right = posx + SCREEN_WIDTH;
-	fillrect.bottom = posy + SCREEN_HEIGHT;
+	fillrect.right = posx + SURFACE_WIDTH;
+	fillrect.bottom = posy + SURFACE_HEIGHT;
 
 	ZeroMemory(&ddbf, sizeof(ddbf));
 	ddbf.dwSize = sizeof(ddbf);