--- np2/common.h	2003/10/16 17:57:05	1.1.1.1
+++ np2/common.h	2004/06/20 03:40:31	1.11
@@ -31,6 +31,47 @@ enum {
 								*((a)+1) = (BYTE)((b)>>8)
 #endif
 
+#ifndef	NELEMENTS
+#define	NELEMENTS(a)	((int)(sizeof(a) / sizeof(a[0])))
+#endif
+
+
+// ---- Optimize Macros
+
+#ifndef REG8
+#define	REG8		UINT8
+#endif
+#ifndef REG16
+#define	REG16		UINT16
+#endif
+
+#ifndef LOW12
+#define	LOW12(a)				((a) & 0x0fff)
+#endif
+#ifndef LOW14
+#define	LOW14(a)				((a) & 0x3fff)
+#endif
+#ifndef LOW15
+#define	LOW15(a)				((a) & 0x7fff)
+#endif
+#ifndef LOW16
+#define	LOW16(a)				((UINT16)(a))
+#endif
+#ifndef HIGH16
+#define	HIGH16(a)				(((UINT32)(a)) >> 16)
+#endif
+
+
+#ifndef OEMCHAR
+#define	OEMCHAR					char
+#endif
+#ifndef OEMTEXT
+#define	OEMTEXT(string)			(string)
+#endif
+#ifndef OEMNULLSTR
+#define	OEMNULLSTR				OEMTEXT("")
+#endif
+
 
 #ifndef STRLITERAL
 #ifdef UNICODE
@@ -40,27 +81,63 @@ enum {
 #endif
 #endif
 
+#if !defined(RGB16)
+#define	RGB16		UINT16
+#endif
+
 #if !defined(RGB32)
 #if defined(BYTESEX_LITTLE)
 typedef union {
+	UINT32	d;
 	struct {
-		BYTE	b;
-		BYTE	g;
-		BYTE	r;
-		BYTE	e;
+		UINT8	b;
+		UINT8	g;
+		UINT8	r;
+		UINT8	e;
 	} p;
-	UINT32	d;
 } RGB32;
+#define	RGB32D(r, g, b)		(((r) << 16) + ((g) << 8) + ((b) << 0))
 #elif defined(BYTESEX_BIG)
 typedef union {
+	UINT32	d;
 	struct {
-		BYTE	e;
-		BYTE	r;
-		BYTE	g;
-		BYTE	b;
+		UINT8	e;
+		UINT8	r;
+		UINT8	g;
+		UINT8	b;
 	} p;
-	UINT32	d;
 } RGB32;
+#define	RGB32D(r, g, b)		(((r) << 16) + ((g) << 8) + ((b) << 0))
+#endif
+#endif
+
+
+enum {
+	FTYPE_NONE = 0,		// ¼«Æ°È½ÊÌ or PC
+	FTYPE_SMIL,
+	FTYPE_TEXT,
+	FTYPE_BMP,
+	FTYPE_PICT,
+	FTYPE_PNG,
+	FTYPE_WAV,
+	FTYPE_OGG,
+	FTYPE_D88,
+	FTYPE_FDI,
+	FTYPE_BETA,
+	FTYPE_THD,
+	FTYPE_NHD,
+	FTYPE_HDI,
+	FTYPE_HDD,
+	FTYPE_S98,
+	FTYPE_MIMPI,
+	FTYPE_USER
+};
+
+
+#if !defined(INLINE)
+#define	INLINE
 #endif
+#if !defined(FASTCALL)
+#define	FASTCALL
 #endif