--- np2/generic/cmndraw.c	2004/04/05 09:45:06	1.7
+++ np2/generic/cmndraw.c	2005/02/07 14:46:10	1.11
@@ -7,30 +7,6 @@
 #include	"minifont.res"
 
 
-void cmndraw_getpals(CMNPALFN *fn, CMNPALS *pal, UINT pals) {
-
-	UINT	i;
-
-	if (fn == NULL) {
-		return;
-	}
-	if (fn->get8) {
-		for (i=0; i<pals; i++) {
-			pal[i].pal8 = (*fn->get8)(fn, i);
-		}
-	}
-	if (fn->get32) {
-		for (i=0; i<pals; i++) {
-			pal[i].pal32.d = (*fn->get32)(fn, i);
-		}
-		if (fn->cnv16) {
-			for (i=0; i<pals; i++) {
-				pal[i].pal16 = (*fn->cnv16)(fn, pal[i].pal32);
-			}
-		}
-	}
-}
-
 void cmndraw_makegrad(RGB32 *pal, int pals, RGB32 bg, RGB32 fg) {
 
 	int		i;
@@ -48,422 +24,13 @@ void cmndraw_makegrad(RGB32 *pal, int pa
 	pal[i].d = fg.d;
 }
 
-#if defined(SUPPORT_8BPP)
-void cmndraw8_fill(const CMNVRAM *vram, int x, int y,
-										int cx, int cy, BYTE fg) {
-
-	BYTE	*p;
-	int		dalign;
-	int		r;
-
-	p = vram->ptr + (x * vram->xalign) + (y * vram->yalign);
-	dalign = vram->yalign - (vram->xalign * cx);
-	do {
-		r = cx;
-		do {
-			*p = fg;
-			p += vram->xalign;
-		} while(--r);
-		p += dalign;
-	} while(--cy);
-}
-
-void cmndraw8_setfg(const CMNVRAM *vram, const BYTE *src,
-										int x, int y, BYTE fg) {
-
-const BYTE	*p;
-	BYTE	*q;
-	BYTE	cy;
-	int		dalign;
-	BYTE	c;
-	BYTE	bit;
-	BYTE	cx;
-
-	p = src + 2;
-	q = vram->ptr + (x * vram->xalign) + (y * vram->yalign);
-	dalign = vram->yalign - (vram->xalign * src[0]);
-	cy = src[1];
-	do {
-		cx = src[0];
-		bit = 0;
-		c = 0;
-		do {
-			if (!bit) {
-				bit = 0x80;
-				c = *p++;
-			}
-			if (c & bit) {
-				*q = fg;
-			}
-			bit >>= 1;
-			q += vram->xalign;
-		} while(--cx);
-		q += dalign;
-	} while(--cy);
-}
-
-void cmndraw8_setpat(const CMNVRAM *vram, const BYTE *src,
-										int x, int y, BYTE bg, BYTE fg) {
-
-const BYTE	*p;
-	BYTE	*q;
-	BYTE	cy;
-	int		dalign;
-	BYTE	c;
-	BYTE	bit;
-	BYTE	cx;
-
-	p = src + 2;
-	q = vram->ptr + (x * vram->xalign) + (y * vram->yalign);
-	dalign = vram->yalign - (vram->xalign * src[0]);
-	cy = src[1];
-	do {
-		cx = src[0];
-		bit = 0;
-		c = 0;
-		do {
-			if (!bit) {
-				bit = 0x80;
-				c = *p++;
-			}
-			if (c & bit) {
-				*q = fg;
-			}
-			else {
-				*q = bg;
-			}
-			bit >>= 1;
-			q += vram->xalign;
-		} while(--cx);
-		q += dalign;
-	} while(--cy);
-}
-#endif
-
-#if defined(SUPPORT_16BPP)
-void cmndraw16_fill(const CMNVRAM *vram, int x, int y,
-										int cx, int cy, UINT16 fg) {
-
-	BYTE	*p;
-	int		dalign;
-	int		r;
-
-	p = vram->ptr + (x * vram->xalign) + (y * vram->yalign);
-	dalign = vram->yalign - (vram->xalign * cx);
-	do {
-		r = cx;
-		do {
-			*(UINT16 *)p = fg;
-			p += vram->xalign;
-		} while(--r);
-		p += dalign;
-	} while(--cy);
-}
-
-void cmndraw16_setfg(const CMNVRAM *vram, const BYTE *src,
-										int x, int y, UINT16 fg) {
-
-const BYTE	*p;
-	BYTE	*q;
-	BYTE	cy;
-	int		dalign;
-	BYTE	c;
-	BYTE	bit;
-	BYTE	cx;
-
-	p = src + 2;
-	q = vram->ptr + (x * vram->xalign) + (y * vram->yalign);
-	dalign = vram->yalign - (vram->xalign * src[0]);
-	cy = src[1];
-	do {
-		cx = src[0];
-		bit = 0;
-		c = 0;
-		do {
-			if (!bit) {
-				bit = 0x80;
-				c = *p++;
-			}
-			if (c & bit) {
-				*(UINT16 *)q = fg;
-			}
-			bit >>= 1;
-			q += vram->xalign;
-		} while(--cx);
-		q += dalign;
-	} while(--cy);
-}
-
-void cmndraw16_setpat(const CMNVRAM *vram, const BYTE *src,
-										int x, int y, UINT16 bg, UINT16 fg) {
-
-const BYTE	*p;
-	BYTE	*q;
-	BYTE	cy;
-	int		dalign;
-	BYTE	c;
-	BYTE	bit;
-	BYTE	cx;
-
-	p = src + 2;
-	q = vram->ptr + (x * vram->xalign) + (y * vram->yalign);
-	dalign = vram->yalign - (vram->xalign * src[0]);
-	cy = src[1];
-	do {
-		cx = src[0];
-		bit = 0;
-		c = 0;
-		do {
-			if (!bit) {
-				bit = 0x80;
-				c = *p++;
-			}
-			if (c & bit) {
-				*(UINT16 *)q = fg;
-			}
-			else {
-				*(UINT16 *)q = bg;
-			}
-			bit >>= 1;
-			q += vram->xalign;
-		} while(--cx);
-		q += dalign;
-	} while(--cy);
-}
-#endif
-
-#if defined(SUPPORT_24BPP)
-void cmndraw24_fill(const CMNVRAM *vram, int x, int y,
-										int cx, int cy, RGB32 fg) {
-
-	BYTE	*p;
-	int		dalign;
-	int		r;
-
-	p = vram->ptr + (x * vram->xalign) + (y * vram->yalign);
-	dalign = vram->yalign - (vram->xalign * cx);
-	do {
-		r = cx;
-		do {
-			p[RGB24_R] = fg.p.r;
-			p[RGB24_G] = fg.p.g;
-			p[RGB24_B] = fg.p.b;
-			p += vram->xalign;
-		} while(--r);
-		p += dalign;
-	} while(--cy);
-}
-
-void cmndraw24_setfg(const CMNVRAM *vram, const BYTE *src,
-										int x, int y, RGB32 fg) {
-
-const BYTE	*p;
-	BYTE	*q;
-	BYTE	cy;
-	int		dalign;
-	BYTE	c;
-	BYTE	bit;
-	BYTE	cx;
-
-	p = src + 2;
-	q = vram->ptr + (x * vram->xalign) + (y * vram->yalign);
-	dalign = vram->yalign - (vram->xalign * src[0]);
-	cy = src[1];
-	do {
-		cx = src[0];
-		bit = 0;
-		c = 0;
-		do {
-			if (!bit) {
-				bit = 0x80;
-				c = *p++;
-			}
-			if (c & bit) {
-				q[RGB24_R] = fg.p.r;
-				q[RGB24_G] = fg.p.g;
-				q[RGB24_B] = fg.p.b;
-			}
-			bit >>= 1;
-			q += vram->xalign;
-		} while(--cx);
-		q += dalign;
-	} while(--cy);
-}
-
-void cmndraw24_setpat(const CMNVRAM *vram, const BYTE *src,
-										int x, int y, RGB32 bg, RGB32 fg) {
-
-const BYTE	*p;
-	BYTE	*q;
-	BYTE	cy;
-	int		dalign;
-	BYTE	c;
-	BYTE	bit;
-	BYTE	cx;
-
-	p = src + 2;
-	q = vram->ptr + (x * vram->xalign) + (y * vram->yalign);
-	dalign = vram->yalign - (vram->xalign * src[0]);
-	cy = src[1];
-	do {
-		cx = src[0];
-		bit = 0;
-		c = 0;
-		do {
-			if (!bit) {
-				bit = 0x80;
-				c = *p++;
-			}
-			if (c & bit) {
-				q[RGB24_R] = fg.p.r;
-				q[RGB24_G] = fg.p.g;
-				q[RGB24_B] = fg.p.b;
-			}
-			else {
-				q[RGB24_R] = bg.p.r;
-				q[RGB24_G] = bg.p.g;
-				q[RGB24_B] = bg.p.b;
-			}
-			bit >>= 1;
-			q += vram->xalign;
-		} while(--cx);
-		q += dalign;
-	} while(--cy);
-}
-#endif
-
-#if defined(SUPPORT_32BPP)
-void cmndraw32_fill(const CMNVRAM *vram, int x, int y,
-										int cx, int cy, RGB32 fg) {
-
-	BYTE	*p;
-	int		dalign;
-	int		r;
-
-	p = vram->ptr + (x * vram->xalign) + (y * vram->yalign);
-	dalign = vram->yalign - (vram->xalign * cx);
-	do {
-		r = cx;
-		do {
-			*(UINT32 *)p = fg.d;
-			p += vram->xalign;
-		} while(--r);
-		p += dalign;
-	} while(--cy);
-}
-
-void cmndraw32_setfg(const CMNVRAM *vram, const BYTE *src,
-										int x, int y, RGB32 fg) {
-
-const BYTE	*p;
-	BYTE	*q;
-	BYTE	cy;
-	int		dalign;
-	BYTE	c;
-	BYTE	bit;
-	BYTE	cx;
-
-	p = src + 2;
-	q = vram->ptr + (x * vram->xalign) + (y * vram->yalign);
-	dalign = vram->yalign - (vram->xalign * src[0]);
-	cy = src[1];
-	do {
-		cx = src[0];
-		bit = 0;
-		c = 0;
-		do {
-			if (!bit) {
-				bit = 0x80;
-				c = *p++;
-			}
-			if (c & bit) {
-				*(UINT32 *)q = fg.d;
-			}
-			bit >>= 1;
-			q += vram->xalign;
-		} while(--cx);
-		q += dalign;
-	} while(--cy);
-}
-
-void cmndraw32_setpat(const CMNVRAM *vram, const BYTE *src,
-										int x, int y, RGB32 bg, RGB32 fg) {
-
-const BYTE	*p;
-	BYTE	*q;
-	BYTE	cy;
-	int		dalign;
-	BYTE	c;
-	BYTE	bit;
-	BYTE	cx;
-
-	p = src + 2;
-	q = vram->ptr + (x * vram->xalign) + (y * vram->yalign);
-	dalign = vram->yalign - (vram->xalign * src[0]);
-	cy = src[1];
-	do {
-		cx = src[0];
-		bit = 0;
-		c = 0;
-		do {
-			if (!bit) {
-				bit = 0x80;
-				c = *p++;
-			}
-			if (c & bit) {
-				*(UINT32 *)q = fg.d;
-			}
-			else {
-				*(UINT32 *)q = bg.d;
-			}
-			bit >>= 1;
-			q += vram->xalign;
-		} while(--cx);
-		q += dalign;
-	} while(--cy);
-}
-#endif
-
-
 
 // ----
 
-void cmddraw_fill(CMNVRAM *vram, int x, int y, int cx, int cy, CMNPALS *pal) {
-
-	if ((vram == NULL) || (pal == NULL)) {
-		return;
-	}
-	switch(vram->bpp) {
-#if defined(SUPPORT_8BPP)
-		case 8:
-			cmndraw8_fill(vram, x, y, cx, cy, pal->pal8);
-			break;
-#endif
-#if defined(SUPPORT_16BPP)
-		case 16:
-			cmndraw16_fill(vram, x, y, cx, cy, pal->pal16);
-			break;
-#endif
-#if defined(SUPPORT_24BPP)
-		case 24:
-			cmndraw24_fill(vram, x, y, cx, cy, pal->pal32);
-			break;
-#endif
-#if defined(SUPPORT_32BPP)
-		case 32:
-			cmndraw32_fill(vram, x, y, cx, cy, pal->pal32);
-			break;
-#endif
-	}
-}
-
-
-// ---- new
-
-void cmndraw_fill2(const CMNVRAM *vram, int x, int y,
+void cmndraw_fill(const CMNVRAM *vram, int x, int y,
 										int cx, int cy, CMNPAL fg) {
 
-	BYTE	*p;
+	UINT8	*p;
 	int		dalign;
 	int		r;
 
@@ -502,9 +69,9 @@ void cmndraw_fill2(const CMNVRAM *vram, 
 			do {
 				r = cx;
 				do {
-					p[RGB24_R] = fg.pal32.r;
-					p[RGB24_G] = fg.pal32.g;
-					p[RGB24_B] = fg.pal32.b;
+					p[RGB24_R] = fg.pal32.p.r;
+					p[RGB24_G] = fg.pal32.p.g;
+					p[RGB24_B] = fg.pal32.p.b;
 					p += vram->xalign;
 				} while(--r);
 				p += dalign;
@@ -526,16 +93,16 @@ void cmndraw_fill2(const CMNVRAM *vram, 
 	}
 }
 
-void cmndraw_setfg2(const CMNVRAM *vram, const BYTE *src,
+void cmndraw_setfg(const CMNVRAM *vram, const UINT8 *src,
 										int x, int y, CMNPAL fg) {
 
-const BYTE	*p;
-	BYTE	*q;
-	BYTE	cy;
-	int		dalign;
-	BYTE	c;
-	BYTE	bit;
-	BYTE	cx;
+const UINT8	*p;
+	UINT8	*q;
+	UINT8	cy;
+	int		dalign;
+	UINT8	c;
+	UINT8	bit;
+	UINT8	cx;
 
 	if (vram == NULL) {
 		return;
@@ -616,16 +183,16 @@ const BYTE	*p;
 	} while(--cy);
 }
 
-void cmndraw_setpat2(const CMNVRAM *vram, const BYTE *src,
+void cmndraw_setpat(const CMNVRAM *vram, const UINT8 *src,
 										int x, int y, CMNPAL bg, CMNPAL fg) {
 
-const BYTE	*p;
-	BYTE	*q;
-	BYTE	cy;
-	int		dalign;
-	BYTE	c;
-	BYTE	bit;
-	BYTE	cx;
+const UINT8	*p;
+	UINT8	*q;
+	UINT8	cy;
+	int		dalign;
+	UINT8	c;
+	UINT8	bit;
+	UINT8	cx;
 
 	p = src + 2;
 	q = vram->ptr + (x * vram->xalign) + (y * vram->yalign);
@@ -644,10 +211,10 @@ const BYTE	*p;
 						c = *p++;
 					}
 					if (c & bit) {
-						*q = fg;
+						*q = fg.pal8;
 					}
 					else {
-						*q = bg;
+						*q = bg.pal8;
 					}
 					bit >>= 1;
 					q += vram->xalign;
@@ -718,23 +285,13 @@ const BYTE	*p;
 }
 
 
-
-
-
-
-
-
-
-
-
-
 // ----
 
 void cmddraw_text8(CMNVRAM *vram, int x, int y, const char *str, CMNPAL fg) {
 
 	UINT	s;
-const BYTE	*ptr;
-	BYTE	src[10];
+const UINT8	*ptr;
+	UINT8	src[10];
 
 	if ((vram == NULL) || (str == NULL)) {
 		return;
@@ -755,7 +312,7 @@ const BYTE	*ptr;
 		}
 		src[0] = ptr[0];
 		CopyMemory(src + 2, ptr + 1, 7);
-		cmndraw_setfg2(vram, src, x, y, fg);
+		cmndraw_setfg(vram, src, x, y, fg);
 		x += ptr[0] + 1;
 	}
 }
@@ -767,9 +324,9 @@ BOOL cmndraw_bmp4inf(CMNBMP *bmp, const 
 
 const BMPFILE	*bf;
 const BMPINFO	*bi;
-const BYTE		*palptr;
+const UINT8		*palptr;
 	BMPDATA		inf;
-	BYTE		*src;
+	UINT8		*src;
 	int			bmpalign;
 	UINT		pals;
 	UINT		c;
@@ -779,14 +336,14 @@ const BYTE		*palptr;
 	}
 	bf = (BMPFILE *)ptr;
 	bi = (BMPINFO *)(bf + 1);
-	palptr = (BYTE *)(bi + 1);
+	palptr = (UINT8 *)(bi + 1);
 	if (((bf->bfType[0] != 'B') && (bf->bfType[1] != 'M')) ||
 		(bmpdata_getinfo(bi, &inf) != SUCCESS) || (inf.bpp != 4)) {
 		return(FAILURE);
 	}
 	pals = min(LOADINTELDWORD(bi->biClrUsed), 16);
 
-	src = (BYTE *)bf + (LOADINTELDWORD(bf->bfOffBits));
+	src = (UINT8 *)bf + (LOADINTELDWORD(bf->bfOffBits));
 	bmpalign = bmpdata_getalign(bi);
 	if (inf.height > 0) {
 		bmp->ptr = src + ((inf.height - 1) * bmpalign);
@@ -814,8 +371,8 @@ void cmndraw_bmp16(CMNVRAM *vram, const 
 
 	CMNBMP	bmp;
 	CMNPAL	pal[16];
-	BYTE	*src;
-	BYTE	*dst;
+	UINT8	*src;
+	UINT8	*dst;
 	int		yalign;
 	int		x;
 	int		y;