--- np2/macosx/np2.cpp	2004/02/03 15:58:34	1.51
+++ np2/macosx/np2.cpp	2004/02/25 19:30:40	1.54
@@ -38,6 +38,7 @@
 #include	"np2opening.h"
 #include	"toolwin.h"
 #include	"aboutdlg.h"
+#include	"keystat.h"
 
 #include	<QuickTime/QuickTime.h>
 #define	USE_RESUME
@@ -436,6 +437,12 @@ static void HandleMenuChoice(long wParam
 			update |= SYS_UPDATEOSCFG;
 			break;
 
+		case IDM_F11USER:
+			menu_setf11key(4);
+			mackbd_resetf11();
+			update |= SYS_UPDATEOSCFG;
+			break;
+
 		case IDM_F12MOUSE:
 			menu_setf12key(0);
 			mackbd_resetf12();
@@ -460,6 +467,12 @@ static void HandleMenuChoice(long wParam
 			update |= SYS_UPDATEOSCFG;
 			break;
 
+		case IDM_F12USER:
+			menu_setf12key(4);
+			mackbd_resetf12();
+			update |= SYS_UPDATEOSCFG;
+			break;
+
 		case IDM_BEEPOFF:
 			menu_setbeepvol(0);
 			beep_setvol(0);
@@ -695,11 +708,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) {
@@ -730,7 +743,9 @@ int main(int argc, char *argv[]) {
 
 	TRACEINIT();
     
-    toolwin_readini();
+	keystat_initialize();
+	
+	toolwin_readini();
     if (!(setupMainWindow())) {
         return(0);
     }
@@ -778,7 +793,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);
@@ -902,7 +917,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();