--- np2/generic/cmndraw.h	2004/04/08 13:51:52	1.7
+++ np2/generic/cmndraw.h	2005/02/07 14:46:10	1.9
@@ -2,22 +2,6 @@
 #ifndef __CMNDRAW
 #define __CMNDRAW
 
-
-struct _cmnpalfn {
-	BYTE	(*get8)(struct _cmnpalfn *fn, UINT num);
-	UINT32	(*get32)(struct _cmnpalfn *fn, UINT num);
-	UINT16	(*cnv16)(struct _cmnpalfn *fn, RGB32 pal32);
-	long	userdata;
-};
-typedef struct _cmnpalfn	CMNPALFN;
-
-typedef struct {
-	UINT8	pal8;
-	UINT8	padding;
-	UINT16	pal16;
-	RGB32	pal32;
-} CMNPALS;
-
 typedef union {
 	RGB32	pal32;
 	UINT16	pal16;
@@ -25,7 +9,7 @@ typedef union {
 } CMNPAL;
 
 typedef struct {
-	BYTE	*ptr;
+	UINT8	*ptr;
 	int		width;
 	int		height;
 	int		xalign;
@@ -39,14 +23,13 @@ typedef void (*CMNPALCNV)(CMNPAL *dst, c
 extern "C" {
 #endif
 
-void cmndraw_getpals(CMNPALFN *fn, CMNPALS *pal, UINT pals);
 void cmndraw_makegrad(RGB32 *pal, int pals, RGB32 bg, RGB32 fg);
 
 void cmndraw_fill(const CMNVRAM *vram, int x, int y,
 										int cx, int cy, CMNPAL fg);
-void cmndraw_setfg(const CMNVRAM *vram, const BYTE *src,
+void cmndraw_setfg(const CMNVRAM *vram, const UINT8 *src,
 										int x, int y, CMNPAL fg);
-void cmndraw_setpat(const CMNVRAM *vram, const BYTE *src,
+void cmndraw_setpat(const CMNVRAM *vram, const UINT8 *src,
 										int x, int y, CMNPAL bg, CMNPAL fg);
 void cmddraw_text8(CMNVRAM *vram, int x, int y, const char *str, CMNPAL fg);
 
@@ -63,7 +46,7 @@ enum {
 };
 
 typedef struct {
-	BYTE	*ptr;
+	UINT8	*ptr;
 	int		width;
 	int		height;
 	int		align;