--- xmil/win9x/scrnmng.cpp	2004/08/07 07:19:56	1.5
+++ xmil/win9x/scrnmng.cpp	2004/08/17 12:30:41	1.9
@@ -241,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_USE; 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;
@@ -258,15 +258,15 @@ static void paletteinit(void) {
 
 static void paletteset(void) {
 
-	int		i;
+	UINT	i;
 
-	if ((ddraw.palette != NULL) && (xm_palettes)) {
-		for (i=0; i<xm_palettes; i++) {
-			ddraw.pal[i+START_PAL].peRed = x1n_pal32[i].p.r;
-			ddraw.pal[i+START_PAL].peBlue = x1n_pal32[i].p.b;
-			ddraw.pal[i+START_PAL].peGreen = x1n_pal32[i].p.g;
+	if ((ddraw.palette != NULL) && (xmil_palettes)) {
+		for (i=0; i<xmil_palettes; i++) {
+			ddraw.pal[i+START_PAL].peRed = xmil_pal32[i].p.r;
+			ddraw.pal[i+START_PAL].peBlue = xmil_pal32[i].p.b;
+			ddraw.pal[i+START_PAL].peGreen = xmil_pal32[i].p.g;
 		}
-		ddraw.palette->SetEntries(0, START_PAL, xm_palettes,
+		ddraw.palette->SetEntries(0, START_PAL, xmil_palettes,
 													&ddraw.pal[START_PAL]);
 	}
 }
@@ -402,8 +402,6 @@ BRESULT scrnmng_create(UINT8 mode) {
 		}
 		else {
 			make16mask(ddpf.dwBBitMask, ddpf.dwRBitMask, ddpf.dwGBitMask);
-			scrndraw_changepalette();			// 呼ぶ必要あるの？
-			reflesh_palette();
 			dclock_init16();
 		}
 
@@ -456,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;
@@ -746,7 +741,8 @@ void scrnmng_dispclock(void) {
 
 	DDSURFACEDESC	dest;
 
-	if ((ddraw.clocksurf) && (dclock_disp())) {
+	if ((ddraw.clocksurf) &&
+		(ddraw.scrn.top >= DCLOCK_Y) && (dclock_disp())) {
 		dclock_make();
 		ZeroMemory(&dest, sizeof(dest));
 		dest.dwSize = sizeof(dest);
@@ -760,7 +756,7 @@ void scrnmng_dispclock(void) {
 			ddraw.clocksurf->Unlock(NULL);
 		}
 		if (ddraw.primsurf->BltFast(640 - DCLOCK_X - 4,
-									480 - DCLOCK_Y - 8,
+									ddraw.height - DCLOCK_Y,
 									ddraw.clocksurf, (RECT *)&rectclk,
 									DDBLTFAST_WAIT) == DDERR_SURFACELOST) {
 			ddraw.primsurf->Restore();