--- np2/generic/cmndraw.c	2004/04/06 18:41:00	1.8
+++ np2/generic/cmndraw.c	2004/04/08 13:51:52	1.9
@@ -48,419 +48,10 @@ 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;
@@ -526,7 +117,7 @@ void cmndraw_fill2(const CMNVRAM *vram, 
 	}
 }
 
-void cmndraw_setfg2(const CMNVRAM *vram, const BYTE *src,
+void cmndraw_setfg(const CMNVRAM *vram, const BYTE *src,
 										int x, int y, CMNPAL fg) {
 
 const BYTE	*p;
@@ -616,7 +207,7 @@ const BYTE	*p;
 	} while(--cy);
 }
 
-void cmndraw_setpat2(const CMNVRAM *vram, const BYTE *src,
+void cmndraw_setpat(const CMNVRAM *vram, const BYTE *src,
 										int x, int y, CMNPAL bg, CMNPAL fg) {
 
 const BYTE	*p;
@@ -718,16 +309,6 @@ const BYTE	*p;
 }
 
 
-
-
-
-
-
-
-
-
-
-
 // ----
 
 void cmddraw_text8(CMNVRAM *vram, int x, int y, const char *str, CMNPAL fg) {
@@ -755,7 +336,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;
 	}
 }