--- xmil/win9x/scrnmng.cpp	2004/08/04 10:49:21	1.2
+++ xmil/win9x/scrnmng.cpp	2004/08/07 12:10:27	1.6
@@ -13,10 +13,8 @@
 #include	"extclass.h"
 #include	"pccore.h"
 #include	"scrndraw.h"
-#include	"draw.h"
 #include	"palettes.h"
-#include	"x1_io.h"
-#include	"x1_crtc.h"
+#include	"makescrn.h"
 
 
 typedef struct {
@@ -252,7 +250,7 @@ static void paletteinit(void) {
 		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();
+	pal_reset();
 	ddraw.ddraw2->CreatePalette(DDPCAPS_8BIT, ddraw.pal, &ddraw.palette, 0);
 	ddraw.primsurf->SetPalette(ddraw.palette);
 	scrnmng.palchanged = 0;
@@ -404,8 +402,6 @@ BRESULT scrnmng_create(UINT8 mode) {
 		}
 		else {
 			make16mask(ddpf.dwBBitMask, ddpf.dwRBitMask, ddpf.dwGBitMask);
-			scrndraw_changepalette();			// 呼ぶ必要あるの？
-			reflesh_palette();
 			dclock_init16();
 		}
 
@@ -458,13 +454,10 @@ BRESULT scrnmng_create(UINT8 mode) {
 		}
 		else if (bitcolor == 16) {
 			make16mask(ddpf.dwBBitMask, ddpf.dwRBitMask, ddpf.dwGBitMask);
-			reflesh_palette();
 		}
 		else if (bitcolor == 24) {
-			reflesh_palette();
 		}
 		else if (bitcolor == 32) {
-			reflesh_palette();
 		}
 		else {
 			goto scre_err;
@@ -473,7 +466,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 +635,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);
@@ -768,7 +761,7 @@ void scrnmng_dispclock(void) {
 			ddraw.primsurf->Restore();
 			ddraw.clocksurf->Restore();
 		}
-		dclock_cntdown(xmilcfg.DRAW_SKIP);
+		dclock_cntdown(xmiloscfg.DRAW_SKIP);
 	}
 }