--- xmil/win9x/scrnmng.cpp	2004/08/04 15:18:26	1.3
+++ xmil/win9x/scrnmng.cpp	2004/08/08 09:12:06	1.7
@@ -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 {
@@ -243,16 +241,16 @@ static void paletteinit(void) {
 	hdc = GetDC(hWndMain);
 	GetSystemPaletteEntries(hdc, 0, 256, ddraw.pal);
 	ReleaseDC(hWndMain, hdc);
-	for (i=START_PAL; i<(START_PAL + TOTAL_PALS); i++) {
-		ddraw.pal[i].peFlags = PC_RESERVED | PC_NOCOLLAPSE;
+	for (i=0; i<XMILPAL_TOTAL; i++) {
+		ddraw.pal[i + START_PAL].peFlags = PC_RESERVED | PC_NOCOLLAPSE;
 	}
 	for (i=0; i<4; i++) {
-		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;
+		ddraw.pal[i + START_PALORG].peBlue = dclockpal.pal32[i].p.b;
+		ddraw.pal[i + START_PALORG].peRed = dclockpal.pal32[i].p.r;
+		ddraw.pal[i + START_PALORG].peGreen = dclockpal.pal32[i].p.g;
+		ddraw.pal[i + START_PALORG].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;
@@ -768,7 +761,7 @@ void scrnmng_dispclock(void) {
 			ddraw.primsurf->Restore();
 			ddraw.clocksurf->Restore();
 		}
-		dclock_cntdown(xmilcfg.DRAW_SKIP);
+		dclock_cntdown(xmiloscfg.DRAW_SKIP);
 	}
 }