--- np2/mona/scrnmng.c 2005/02/04 05:45:46 1.1 +++ np2/mona/scrnmng.c 2005/02/12 12:13:58 1.2 @@ -176,7 +176,7 @@ const SCRNSURF *scrnmng_surflock(void) { } SDL_LockSurface(surface); scrnmng.surface = surface; - scrnsurf.ptr = (BYTE *)surface->pixels; + scrnsurf.ptr = (UINT8 *)surface->pixels; scrnsurf.xalign = surface->format->BytesPerPixel; scrnsurf.yalign = surface->pitch; scrnsurf.bpp = surface->format->BitsPerPixel; @@ -198,9 +198,9 @@ static void draw_onmenu(void) { RECT_T rt; SDL_Surface *surface; DRAWRECT dr; -const BYTE *p; - BYTE *q; -const BYTE *a; +const UINT8 *p; + UINT8 *q; +const UINT8 *a; int salign; int dalign; int x; @@ -224,7 +224,7 @@ const BYTE *a; #if defined(SUPPORT_16BPP) case 16: p = scrnmng.vram->ptr + (dr.srcpos * 2); - q = (BYTE *)surface->pixels + dr.dstpos; + q = (UINT8 *)surface->pixels + dr.dstpos; a = menuvram->alpha + dr.srcpos; salign = menuvram->width; dalign = dr.yalign - (dr.width * dr.xalign); @@ -245,7 +245,7 @@ const BYTE *a; #if defined(SUPPORT_24BPP) case 24: p = scrnmng.vram->ptr + (dr.srcpos * 3); - q = (BYTE *)surface->pixels + dr.dstpos; + q = (UINT8 *)surface->pixels + dr.dstpos; a = menuvram->alpha + dr.srcpos; salign = menuvram->width; dalign = dr.yalign - (dr.width * dr.xalign); @@ -268,7 +268,7 @@ const BYTE *a; #if defined(SUPPORT_32BPP) case 32: p = scrnmng.vram->ptr + (dr.srcpos * 4); - q = (BYTE *)surface->pixels + dr.dstpos; + q = (UINT8 *)surface->pixels + dr.dstpos; a = menuvram->alpha + dr.srcpos; salign = menuvram->width; dalign = dr.yalign - (dr.width * dr.xalign); @@ -346,10 +346,10 @@ void scrnmng_menudraw(const RECT_T *rct) SDL_Surface *surface; DRAWRECT dr; -const BYTE *p; -const BYTE *q; - BYTE *r; - BYTE *a; +const UINT8 *p; +const UINT8 *q; + UINT8 *r; + UINT8 *a; int salign; int dalign; int x; @@ -368,7 +368,7 @@ const BYTE *q; case 16: p = scrnmng.vram->ptr + (dr.srcpos * 2); q = menuvram->ptr + (dr.srcpos * 2); - r = (BYTE *)surface->pixels + dr.dstpos; + r = (UINT8 *)surface->pixels + dr.dstpos; a = menuvram->alpha + dr.srcpos; salign = menuvram->width; dalign = dr.yalign - (dr.width * dr.xalign); @@ -397,7 +397,7 @@ const BYTE *q; case 24: p = scrnmng.vram->ptr + (dr.srcpos * 3); q = menuvram->ptr + (dr.srcpos * 3); - r = (BYTE *)surface->pixels + dr.dstpos; + r = (UINT8 *)surface->pixels + dr.dstpos; a = menuvram->alpha + dr.srcpos; salign = menuvram->width; dalign = dr.yalign - (dr.width * dr.xalign); @@ -430,7 +430,7 @@ const BYTE *q; case 32: p = scrnmng.vram->ptr + (dr.srcpos * 4); q = menuvram->ptr + (dr.srcpos * 3); - r = (BYTE *)surface->pixels + dr.dstpos; + r = (UINT8 *)surface->pixels + dr.dstpos; a = menuvram->alpha + dr.srcpos; salign = menuvram->width; dalign = dr.yalign - (dr.width * dr.xalign);