diff options
| -rw-r--r-- | src/angband.rc | 6 | ||||
| -rw-r--r-- | src/config.h | 6 | ||||
| -rw-r--r-- | src/dungeon.c | 9 | ||||
| -rw-r--r-- | src/main-win.c | 44 |
4 files changed, 1 insertions, 64 deletions
diff --git a/src/angband.rc b/src/angband.rc index 00e16516..547d43a1 100644 --- a/src/angband.rc +++ b/src/angband.rc @@ -1,10 +1,5 @@ /* File: angband.rc */ -/* - * If the windows command to compile this file understands #ifdef's, please - * say #ifdef ALLOW_QUITTING to select from "A&bort" and "Sh&ow scores" - */ - ANGBAND MENU { POPUP "&File" @@ -12,7 +7,6 @@ ANGBAND MENU MENUITEM "&Save", 110 MENUITEM SEPARATOR MENUITEM "S&how score", 120 - /*MENUITEM "A&bort", 120*/ MENUITEM "E&xit", 121 } diff --git a/src/config.h b/src/config.h index 73e016e2..2215f075 100644 --- a/src/config.h +++ b/src/config.h @@ -251,12 +251,6 @@ /* # define FORCE_V_IDX 20 */ /* - * Enable the CTRL + L command to quit without saving - * Only use for debugging purpose, otherwise you are a CHEATER - */ -/* #define ALLOW_QUITTING */ - -/* * Allow makefiles to override the default file mode */ #ifndef FILE_MODE diff --git a/src/dungeon.c b/src/dungeon.c index 3a725720..ae8d6912 100644 --- a/src/dungeon.c +++ b/src/dungeon.c @@ -3473,15 +3473,6 @@ static void process_command(void) break; } -#ifdef ALLOW_QUITTING - - case KTRL('L'): - { - quit("CHEATER"); - break; - } - -#endif /*** Wizard Commands ***/ diff --git a/src/main-win.c b/src/main-win.c index fdde5e87..a618de96 100644 --- a/src/main-win.c +++ b/src/main-win.c @@ -101,11 +101,7 @@ #define IDM_FILE_NEW 100 #define IDM_FILE_OPEN 101 #define IDM_FILE_SAVE 110 -#ifdef ALLOW_QUITTING -# define IDM_FILE_ABORT 120 -#else -# define IDM_FILE_SCORE 120 -#endif +#define IDM_FILE_SCORE 120 #define IDM_FILE_EXIT 121 #define IDM_WINDOW_VIS_0 200 @@ -2465,13 +2461,8 @@ static void setup_menus(void) MF_BYCOMMAND | MF_DISABLED | MF_GRAYED); EnableMenuItem(hm, IDM_FILE_SAVE, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED); -#ifdef ALLOW_QUITTING - EnableMenuItem(hm, IDM_FILE_ABORT, - MF_BYCOMMAND | MF_DISABLED | MF_GRAYED); -#else EnableMenuItem(hm, IDM_FILE_SCORE, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED); -#endif /* ALLOW_QUITTING */ EnableMenuItem(hm, IDM_FILE_EXIT, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED); @@ -2495,14 +2486,6 @@ static void setup_menus(void) MF_BYCOMMAND | MF_ENABLED); } -#ifdef ALLOW_QUITTING - - /* Menu "File", Item "Abort" */ - EnableMenuItem(hm, IDM_FILE_ABORT, - MF_BYCOMMAND | MF_ENABLED); - -#else - /* Menu "File", Item "Score" */ if (initialized && character_generated && !character_icky) { @@ -2510,8 +2493,6 @@ static void setup_menus(void) MF_BYCOMMAND | MF_ENABLED); } -#endif - /* Menu "File", Item "Exit" */ EnableMenuItem(hm, IDM_FILE_EXIT, MF_BYCOMMAND | MF_ENABLED); @@ -2832,27 +2813,6 @@ ofn.lStructSize = sizeof(OPENFILENAME); break; } -#ifdef ALLOW_QUITTING - - /* Abort */ - case IDM_FILE_ABORT: - { - if (game_in_progress && character_generated) - { - /* XXX XXX XXX */ - if (MessageBox(data[0].w, - "Your character will be not saved!", "Warning", - MB_ICONEXCLAMATION | MB_OKCANCEL) == IDCANCEL) - { - break; - } - } - quit(NULL); - break; - } - -#else - /* Score */ case IDM_FILE_SCORE: { @@ -2862,8 +2822,6 @@ ofn.lStructSize = sizeof(OPENFILENAME); break; } -#endif - case IDM_WINDOW_VIS_0: { plog("You are not allowed to do that!"); |