^Xにマクロを割り当てるとWindowsで[x]やメニューを使った場合などで問題が出たので, Windowsのメニューか[x]から終了させる場合は内部コード252を発行す...

diff --git a/src/dungeon.c b/src/dungeon.c
index 11a56ff..53bcd66 100644 (file)
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -4837,6 +4837,7 @@ msg_print("
 
                /* Save and quit */
                case KTRL('X'):
+               case 252:
                {
                        do_cmd_save_and_exit();
                        break;

diff --git a/src/main-win.c b/src/main-win.c
index 37938bd..6fe485b 100644 (file)
--- a/src/main-win.c
+++ b/src/main-win.c
@@ -3360,7 +3360,7 @@ static void process_menus(WORD wCmd)
 #else /* ZANGBAND */
                                /* do_cmd_save_game(); */
 #endif /* ZANGBAND */
-                               Term_key_push(KTRL('X'));
+                               Term_key_push(252);
                                break;
                        }
                        quit(NULL);
@@ -4058,7 +4058,7 @@ LRESULT FAR PASCAL AngbandWndProc(HWND hWnd, UINT uMsg,
 #else /* ZANGBAND */
                                /* do_cmd_save_game(); */
 #endif /* ZANGBAND */
-                               Term_key_push(KTRL('X'));
+                               Term_key_push(252);
                                return 0;
                        }
                        quit(NULL);