--- np2/win9xc/np2.h	2003/12/27 02:29:44	1.4
+++ np2/win9xc/np2.h	2005/03/20 08:58:20	1.8
@@ -6,26 +6,24 @@
 typedef struct {
 	int		winx;
 	int		winy;
-	BYTE	NOWAIT;
-	BYTE	DRAW_SKIP;
+	UINT8	NOWAIT;
+	UINT8	DRAW_SKIP;
 
-	BYTE	KEYBOARD;
-	BYTE	F12COPY;
+	UINT8	KEYBOARD;
+	UINT8	F12COPY;
 
-	BYTE	MOUSE_SW;
-	BYTE	JOYPAD1;
-	BYTE	JOYPAD2;
-	BYTE	JOY1BTN[4];
-
-	BYTE	jastsnd;
-	BYTE	I286SAVE;
+	UINT8	MOUSE_SW;
+	UINT8	JOYPAD1;
+	UINT8	JOYPAD2;
+	UINT8	JOY1BTN[4];
+
+	UINT8	resume;
+	UINT8	jastsnd;
+	UINT8	I286SAVE;
 } NP2OSCFG;
 
 
 enum {
-	SCREEN_WBASE		= 80,
-	SCREEN_HBASE		= 50,
-	SCREEN_DEFMUL		= 8,
 	FULLSCREEN_WIDTH	= 640,
 	FULLSCREEN_HEIGHT	= 480
 };
@@ -34,7 +32,8 @@ enum {
 enum {
 	IDM_MEMORYDUMP		= 20000,
 
-	IDM_I286SAVE		= 20200,
+	IDM_FLAGSAVE		= 20100,
+	IDM_FLAGLOAD		= 20150,
 
 	WM_NP2CMD			= (WM_USER + 200)
 };
@@ -46,14 +45,17 @@ enum {
 	NP2CMD_DUMMY		= 0xffff
 };
 
-extern	const char	szAppCaption[];
+// #define	STATSAVEMAX		10
+
+extern	const TCHAR	szAppCaption[];
 extern	NP2OSCFG	np2oscfg;
 extern	HWND		hWndMain;
 extern	HINSTANCE	hInst;
 extern	HINSTANCE	hPrev;
-extern	char		modulefile[MAX_PATH];
-extern	char		fddfolder[MAX_PATH];
-extern	char		hddfolder[MAX_PATH];
-extern	char		bmpfilefolder[MAX_PATH];
-extern	char		mimpideffile[MAX_PATH];
+
+extern	TCHAR		modulefile[MAX_PATH];
+extern	TCHAR		fddfolder[MAX_PATH];
+extern	TCHAR		hddfolder[MAX_PATH];
+extern	TCHAR		bmpfilefolder[MAX_PATH];
+extern	TCHAR		mimpideffile[MAX_PATH];