--- np2/win9x/scrnmng.cpp	2004/05/23 15:01:45	1.17
+++ np2/win9x/scrnmng.cpp	2005/02/16 09:31:55	1.20
@@ -37,7 +37,7 @@ typedef struct {
 	UINT8				r16b;
 	UINT8				l16r;
 	UINT8				l16g;
-	BYTE				menudisp;
+	UINT8				menudisp;
 	int					menusize;
 	RECT				scrn;
 	RECT				rect;
@@ -297,14 +297,14 @@ static void paletteset(void) {
 
 static void make16mask(DWORD bmask, DWORD rmask, DWORD gmask) {
 
-	BYTE	sft;
+	UINT8	sft;
 
 	sft = 0;
 	while((!(bmask & 0x80)) && (sft < 32)) {
 		bmask <<= 1;
 		sft++;
 	}
-	ddraw.pal16mask.p.b = (BYTE)bmask;
+	ddraw.pal16mask.p.b = (UINT8)bmask;
 	ddraw.r16b = sft;
 
 	sft = 0;
@@ -312,7 +312,7 @@ static void make16mask(DWORD bmask, DWOR
 		rmask >>= 1;
 		sft++;
 	}
-	ddraw.pal16mask.p.r = (BYTE)rmask;
+	ddraw.pal16mask.p.r = (UINT8)rmask;
 	ddraw.l16r = sft;
 
 	sft = 0;
@@ -320,7 +320,7 @@ static void make16mask(DWORD bmask, DWOR
 		gmask >>= 1;
 		sft++;
 	}
-	ddraw.pal16mask.p.g = (BYTE)gmask;
+	ddraw.pal16mask.p.g = (UINT8)gmask;
 	ddraw.l16g = sft;
 }
 
@@ -336,7 +336,7 @@ void scrnmng_initialize(void) {
 	setwindowsize(hWndMain, 640, 400);
 }
 
-BOOL scrnmng_create(BYTE scrnmode) {
+BRESULT scrnmng_create(UINT8 scrnmode) {
 
 	DWORD			winstyle;
 	DWORD			winstyleex;
@@ -391,11 +391,14 @@ BOOL scrnmng_create(BYTE scrnmode) {
 		ddraw2->SetCooperativeLevel(hWndMain,
 										DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN);
 		height = (np2oscfg.force400)?400:480;
+		bitcolor = np2oscfg.fscrnbpp;
+		if (bitcolor == 0) {
 #if !defined(SUPPORT_PC9821)
-		bitcolor = (scrnmode & SCRNMODE_HIGHCOLOR)?16:8;
+			bitcolor = (scrnmode & SCRNMODE_HIGHCOLOR)?16:8;
 #else
-		bitcolor = 16;
+			bitcolor = 16;
 #endif
+		}
 		if (ddraw2->SetDisplayMode(640, height, bitcolor, 0, 0) != DD_OK) {
 			goto scre_err;
 		}
@@ -428,20 +431,26 @@ BOOL scrnmng_create(BYTE scrnmode) {
 		}
 		if (bitcolor == 8) {
 			paletteinit();
-			dclock_init8();
+		}
+		else if (bitcolor == 16) {
+			make16mask(ddpf.dwBBitMask, ddpf.dwRBitMask, ddpf.dwGBitMask);
+		}
+		else if (bitcolor == 24) {
+			goto scre_err;
+		}
+		else if (bitcolor == 32) {
 		}
 		else {
-			make16mask(ddpf.dwBBitMask, ddpf.dwRBitMask,
-														ddpf.dwGBitMask);
-			dclock_init16();
+			goto scre_err;
 		}
+		dclock_palset(bitcolor);
 
 		ZeroMemory(&ddsd, sizeof(ddsd));
 		ddsd.dwSize = sizeof(ddsd);
 		ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT;
 		ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN;
-		ddsd.dwWidth = DCLOCK_X;
-		ddsd.dwHeight = DCLOCK_Y;
+		ddsd.dwWidth = DCLOCK_WIDTH;
+		ddsd.dwHeight = DCLOCK_HEIGHT;
 		ddraw2->CreateSurface(&ddsd, &ddraw.clocksurf, NULL);
 		dclock_reset();
 	}
@@ -485,11 +494,7 @@ BOOL scrnmng_create(BYTE scrnmode) {
 		}
 		bitcolor = ddpf.dwRGBBitCount;
 		if (bitcolor == 8) {
-#if !defined(SUPPORT_PC9821)
 			paletteinit();
-#else
-			goto scre_err;
-#endif
 		}
 		else if (bitcolor == 16) {
 			make16mask(ddpf.dwBBitMask, ddpf.dwRBitMask, ddpf.dwGBitMask);
@@ -575,7 +580,7 @@ RGB16 scrnmng_makepal16(RGB32 pal32) {
 
 void scrnmng_fullscrnmenu(int y) {
 
-	BYTE	menudisp;
+	UINT8	menudisp;
 
 	if (scrnmng.flag & SCRNFLAG_FULLSCREEN) {
 		menudisp = ((y >= 0) && (y < ddraw.menusize))?1:0;
@@ -668,18 +673,18 @@ const SCRNSURF *scrnmng_surflock(void) {
 		return(NULL);
 	}
 	if (!(ddraw.scrnmode & SCRNMODE_ROTATE)) {
-		scrnsurf.ptr = (BYTE *)destscrn.lpSurface;
+		scrnsurf.ptr = (UINT8 *)destscrn.lpSurface;
 		scrnsurf.xalign = scrnsurf.bpp >> 3;
 		scrnsurf.yalign = destscrn.lPitch;
 	}
 	else if (!(ddraw.scrnmode & SCRNMODE_ROTATEDIR)) {
-		scrnsurf.ptr = (BYTE *)destscrn.lpSurface;
+		scrnsurf.ptr = (UINT8 *)destscrn.lpSurface;
 		scrnsurf.ptr += (scrnsurf.width - 1) * destscrn.lPitch;
 		scrnsurf.xalign = 0 - destscrn.lPitch;
 		scrnsurf.yalign = scrnsurf.bpp >> 3;
 	}
 	else {
-		scrnsurf.ptr = (BYTE *)destscrn.lpSurface;
+		scrnsurf.ptr = (UINT8 *)destscrn.lpSurface;
 		scrnsurf.ptr += (scrnsurf.height - 1) * (scrnsurf.bpp >> 3);
 		scrnsurf.xalign = destscrn.lPitch;
 		scrnsurf.yalign = 0 - (scrnsurf.bpp >> 3);
@@ -753,14 +758,14 @@ void scrnmng_setmultiple(int multiple) {
 	}
 }
 
-static const RECT rectclk = {0, 0, DCLOCK_X, DCLOCK_Y};
+static const RECT rectclk = {0, 0, DCLOCK_WIDTH, DCLOCK_HEIGHT};
 
 void scrnmng_dispclock(void) {
 
 	DDSURFACEDESC	dest;
 																// ver0.26
 	if ((ddraw.clocksurf) &&
-		(ddraw.scrn.top >= DCLOCK_Y) && (dclock_disp())) {
+		(ddraw.scrn.top >= DCLOCK_HEIGHT) && (dclock_disp())) {
 		dclock_make();
 		ZeroMemory(&dest, sizeof(dest));
 		dest.dwSize = sizeof(dest);
@@ -768,13 +773,16 @@ void scrnmng_dispclock(void) {
 			if (scrnmng.bpp == 8) {
 				dclock_out8(dest.lpSurface, dest.lPitch);
 			}
-			else {
+			else if (scrnmng.bpp == 16) {
 				dclock_out16(dest.lpSurface, dest.lPitch);
 			}
+			else if (scrnmng.bpp == 32) {
+				dclock_out32(dest.lpSurface, dest.lPitch);
+			}
 			ddraw.clocksurf->Unlock(NULL);
 		}
-		if (ddraw.primsurf->BltFast(640 - DCLOCK_X - 4,
-									ddraw.height - DCLOCK_Y, 
+		if (ddraw.primsurf->BltFast(640 - DCLOCK_WIDTH - 4,
+									ddraw.height - DCLOCK_HEIGHT,
 									ddraw.clocksurf, (RECT *)&rectclk,
 									DDBLTFAST_WAIT) == DDERR_SURFACELOST) {
 			ddraw.primsurf->Restore();