--- np2/wince/np2.cpp	2003/12/05 19:42:03	1.5
+++ np2/wince/np2.cpp	2004/06/14 13:35:40	1.16
@@ -29,27 +29,25 @@
 #include	"fddfile.h"
 #include	"font.h"
 #include	"timing.h"
-#include	"statsave.h"
+#include	"keystat.h"
 #include	"vramhdl.h"
 #include	"menubase.h"
 #include	"sysmenu.h"
-#if defined(SUPPORT_SOFTKBD)
 #include	"softkbd.h"
-#endif
 
 
 static const TCHAR szAppCaption[] = STRLITERAL("Neko Project II");
 static const TCHAR szClassName[] = STRLITERAL("NP2-MainWindow");
 
 
-		NP2OSCFG	np2oscfg = {0, 2, 0, 0,
+		NP2OSCFG	np2oscfg = {0, 0, 0, 0,
 #if !defined(GX_DLL)
 								CW_USEDEFAULT, CW_USEDEFAULT,
 #endif
 #if defined(WIN32_PLATFORM_PSPC)
 								0, 0,
 #endif
-							};
+								0};
 		HWND		hWndMain;
 		HINSTANCE	hInst;
 		HINSTANCE	hPrev;
@@ -109,11 +107,11 @@ static int flagload(const char *ext, con
 	getstatfilename(path, ext, sizeof(path));
 	id = DID_YES;
 	ret = statsave_check(path, buf, sizeof(buf));
-	if (ret & (~NP2FLAG_DISKCHG)) {
+	if (ret & (~STATFLAG_DISKCHG)) {
 		menumbox("Couldn't restart", title, MBOX_OK | MBOX_ICONSTOP);
 		id = DID_NO;
 	}
-	else if ((!force) && (ret & NP2FLAG_DISKCHG)) {
+	else if ((!force) && (ret & STATFLAG_DISKCHG)) {
 		SPRINTF(buf2, "Conflict!\n\n%s\nContinue?", buf);
 		id = menumbox(buf2, title, MBOX_YESNOCAN | MBOX_ICONQUESTION);
 	}
@@ -202,7 +200,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT
 				}
 				else {
 #if defined(SUPPORT_SOFTKBD)
-					softkbd_down(LOWORD(lParam), HIWORD(lParam));
+					softkbd_down(LOWORD(lParam), HIWORD(lParam) - 200);
 #endif
 				}
 			}
@@ -232,8 +230,12 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT
 
 #if !defined(GX_DLL)
 		case WM_MOVE:
+#if !defined(_WIN32_WCE)
 			if (!(GetWindowLong(hWnd, GWL_STYLE) &
-											(WS_MAXIMIZE | WS_MINIMIZE))) {
+											(WS_MAXIMIZE | WS_MINIMIZE)))
+#endif
+			{
+				RECT rc;
 				GetWindowRect(hWnd, &rc);
 				np2oscfg.winx = rc.left;
 				np2oscfg.winy = rc.top;
@@ -265,7 +267,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT
 			if (sysrunning) {
 				if (LOWORD(wParam) != WA_INACTIVE) {
 					GXResume();
-#if defined(WIN32_PLATFORM_PSPC)
+#if defined(GX_DLL)
 					scrnmng_enable(TRUE);
 #endif
 					scrndraw_redraw();
@@ -275,7 +277,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT
 				else {
 					sysrunning &= ~SYSRUNNING_FORE;
 					soundmng_disable(SNDPROC_MAIN);
-#if defined(WIN32_PLATFORM_PSPC)
+#if defined(GX_DLL)
 					scrnmng_enable(FALSE);
 #endif
 					GXSuspend();
@@ -304,9 +306,11 @@ static void processwait(UINT cnt) {
 		timing_setcount(0);
 		framereset(cnt);
 	}
+#if !defined(_WIN32_WCE)
 	else {
 		Sleep(1);
 	}
+#endif
 }
 
 
@@ -340,9 +344,17 @@ static DWORD GetModuleFileName_A(HMODULE
 }
 #endif
 
+#if defined(_WIN32_WCE)
 int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPreInst,
-										LPTSTR lpszCmdLine, int nCmdShow) {
-
+										LPWSTR lpszCmdLine, int nCmdShow)
+#elif defined(UNICODE)
+int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPreInst,
+										LPSTR lpszCmdLine, int nCmdShow)
+#else
+int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPreInst,
+										LPSTR lpszCmdLine, int nCmdShow)
+#endif
+{
 	HWND		hWnd;
 	WNDCLASS	np2;
 	int			id;
@@ -372,7 +384,7 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 	TRACEINIT();
 
 	inputmng_init();
-	keystat_reset();
+	keystat_initialize();
 
 //	if (!hPreInst) {
 		np2.style = CS_HREDRAW | CS_VREDRAW;