--- np2/common.h	2003/11/28 08:01:32	1.3
+++ np2/common.h	2004/03/26 06:47:11	1.9
@@ -32,7 +32,7 @@ enum {
 #endif
 
 
-// Optimize Macros
+// ---- Optimize Macros
 
 #ifndef REG8
 #define	REG8		BYTE
@@ -40,9 +40,6 @@ enum {
 #ifndef REG16
 #define	REG16		UINT16
 #endif
-#ifndef REG32
-#define	REG32		UINT32
-#endif
 
 #ifndef LOW12
 #define	LOW12(a)				((a) & 0x0fff)
@@ -75,24 +72,56 @@ enum {
 #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