--- np2/generic/cmndraw.c	2003/11/21 06:51:11	1.1
+++ np2/generic/cmndraw.c	2004/03/10 07:41:48	1.4
@@ -1,8 +1,35 @@
 #include	"compiler.h"
 #include	"scrnmng.h"
+#include	"cpucore.h"
+#include	"font.h"
 #include	"cmndraw.h"
+#include	"minifont.res"
 
 
+void cmndraw_getpals(CMNPALFN *fn, CMNPAL *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;
@@ -396,3 +423,87 @@ const BYTE	*p;
 }
 #endif
 
+
+
+// ----
+
+void cmddraw_fill(CMNVRAM *vram, int x, int y, int cx, int cy, CMNPAL *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
+	}
+}
+
+void cmddraw_text8(CMNVRAM *vram, int x, int y, const char *str, CMNPAL *pal) {
+
+	UINT	s;
+const BYTE	*ptr;
+	BYTE	src[10];
+
+	if ((vram == NULL) || (str == NULL) || (pal == NULL)) {
+		return;
+	}
+	src[0] = 0;
+	src[1] = 7;
+	while(*str) {
+		s = (UINT)(*str++);
+		ptr = NULL;
+		if ((s >= 0x20) && (s < 0x80)) {
+			ptr = minifont + (s - 0x20) * 8;
+		}
+		else if ((s >= 0xa0) && (s < 0xe0)) {
+			ptr = minifont + (s - 0xa0 + 0x60) * 8;
+		}
+		if (ptr == NULL) {
+			continue;
+		}
+		src[0] = ptr[0];
+		CopyMemory(src + 2, ptr + 1, 7);
+		switch(vram->bpp) {
+#if defined(SUPPORT_8BPP)
+			case 8:
+				cmndraw8_setfg(vram, src, x, y, pal->pal8);
+				break;
+#endif
+#if defined(SUPPORT_16BPP)
+			case 16:
+				cmndraw16_setfg(vram, src, x, y, pal->pal16);
+				break;
+#endif
+#if defined(SUPPORT_24BPP)
+			case 24:
+				cmndraw24_setfg(vram, src, x, y, pal->pal32);
+				break;
+#endif
+#if defined(SUPPORT_32BPP)
+			case 32:
+				cmndraw32_setfg(vram, src, x, y, pal->pal32);
+				break;
+#endif
+		}
+		x += ptr[0] + 1;
+	}
+}
+