--- np2/macosx/np2.cpp	2004/02/16 05:31:31	1.52
+++ np2/macosx/np2.cpp	2004/03/02 23:23:06	1.55
@@ -38,14 +38,29 @@
 #include	"np2opening.h"
 #include	"toolwin.h"
 #include	"aboutdlg.h"
+#include	"keystat.h"
 
-#include	<QuickTime/QuickTime.h>
 #define	USE_RESUME
 #define	NP2OPENING
 // #define	OPENING_WAIT	1500
 
 
-		NP2OSCFG	np2oscfg = {"Neko Project IIx", -1, -1, 0, 0, 0, 0, 0, 0, 0, 1, 0};
+		NP2OSCFG	np2oscfg = {"Neko Project IIx",						//titles
+								-1,										//winx
+								-1,										//winy
+								0,										//NOWAIT
+								0,										//DRAW_SKIP
+								0,										//DISPCLK
+								0,										//F11KEY
+								0,										//F12KEY
+								0,										//MOUSE_SW
+								0,										//JOYPAD1
+								{5, 0, 0x3e, 19200, "", "", "GM", ""},  //mpu
+								0,										//confirm
+								0,										//resume
+								1,										//toolwin
+								0,										//jastsnd
+								0};										//I286SAVE
 
 		WindowPtr	hWndMain;
 		BOOL		np2running;
@@ -185,7 +200,7 @@ static void changescreen(BYTE mode) {
 	}
 }
 
-static void HandleMenuChoice(long wParam) {
+void HandleMenuChoice(long wParam) {
 
 	UINT	update;
 
@@ -707,11 +722,11 @@ static void flagload(const char *ext) {
     ret = IDOK;
 	getstatfilename(path, ext, sizeof(path));
 	r = statsave_check(path, buf, sizeof(buf));
-	if (r & (~NP2FLAG_DISKCHG)) {
+	if (r & (~STATFLAG_DISKCHG)) {
 		ResumeErrorDialogProc();
 		ret = IDCANCEL;
 	}
-	else if (r & NP2FLAG_DISKCHG) {
+	else if (r & STATFLAG_DISKCHG) {
 		ret = ResumeWarningDialogProc(buf);
 	}
 	if (ret == IDOK) {
@@ -742,7 +757,9 @@ int main(int argc, char *argv[]) {
 
 	TRACEINIT();
     
-    toolwin_readini();
+	keystat_initialize();
+	
+	toolwin_readini();
     if (!(setupMainWindow())) {
         return(0);
     }
@@ -790,7 +807,7 @@ int main(int argc, char *argv[]) {
 	S98_init();
 
     hid_init();
-#ifndef SUPPORT_WAVEMIX
+#ifndef SUPPORT_SWSEEKSND
 	if (soundmng_initialize() == SUCCESS) {
 		soundmng_pcmvolume(SOUND_PCMSEEK, np2cfg.MOTORVOL);
 		soundmng_pcmvolume(SOUND_PCMSEEK1, np2cfg.MOTORVOL);
@@ -914,7 +931,7 @@ int main(int argc, char *argv[]) {
 #if defined(NP2GCC)
 	mousemng_disable(MOUSEPROC_SYSTEM);
 #endif
-#ifndef SUPPORT_WAVEMIX
+#ifndef SUPPORT_SWSEEKSND
 	soundmng_deinitialize();
 #endif
 	scrnmng_destroy();
@@ -1264,7 +1281,3 @@ static void toggleFullscreen(void) {
     CheckMenuItem(GetMenuHandle(IDM_SCREEN), LoWord(IDM_FULLSCREEN), scrnmode & SCRNMODE_FULLSCREEN);
     soundmng_play();
 }
-
-void recieveCommand(long param) {
-    HandleMenuChoice(param);
-}