--- np2/macosx/menu.cpp	2003/10/30 19:39:52	1.8
+++ np2/macosx/menu.cpp	2003/11/08 17:54:26	1.10
@@ -5,6 +5,7 @@
 #include	"menu.h"
 #include	"pccore.h"
 #include	"soundrecording.h"
+#include	"scrnmng.h"
 
 #define	MFCHECK(a)					((a)?1:0)
 #ifdef TARGET_API_MAC_CARBON
@@ -97,13 +98,15 @@ void menu_setf12copy(BYTE value) {
 	MenuHandle	hmenu;
 
 	hmenu = _GetMenu(IDM_KEYBOARD);
-	if (value >= 3) {
+	if (value >= 5) {
 		value = 0;
 	}
 	np2oscfg.F12COPY = value;
 	_CheckMenuItem(hmenu, IDM_F12MOUSE, MFCHECK(value == 0));
 	_CheckMenuItem(hmenu, IDM_F12COPY, MFCHECK(value == 1));
 	_CheckMenuItem(hmenu, IDM_F12STOP, MFCHECK(value == 2));
+	_CheckMenuItem(hmenu, IDM_F12EQU, MFCHECK(value == 3));
+	_CheckMenuItem(hmenu, IDM_F12COMMA, MFCHECK(value == 4));
 }
 
 void menu_setbeepvol(BYTE value) {
@@ -133,6 +136,7 @@ void menu_setsound(BYTE value) {
 	_CheckMenuItem(hmenu, IDM_PC9801_118, MFCHECK(np2cfg.SOUND_SW == 0x08));
 	_CheckMenuItem(hmenu, IDM_SPEAKBOARD, MFCHECK(np2cfg.SOUND_SW & 0x20));
 	_CheckMenuItem(hmenu, IDM_SPARKBOARD, MFCHECK(np2cfg.SOUND_SW & 0x40));
+	_CheckMenuItem(hmenu, IDM_AMD98, MFCHECK(np2cfg.SOUND_SW & 0x80));
 }
 
 void menu_setmotorflg(BYTE value) {
@@ -193,6 +197,14 @@ void menu_setmouse(BYTE value) {
 	value &= 1;
 	np2oscfg.MOUSE_SW = value;
 	_CheckMenuItem(GetMenu(IDM_DEVICE), IDM_MOUSE, MFCHECK(value));
+    if (scrnmode & SCRNMODE_FULLSCREEN) {
+        if (!value) {
+            ShowMenuBar();
+        }
+        else {
+            HideMenuBar();
+        }
+    }
 }
 #endif