diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/config.h | 5 | ||||
-rw-r--r-- | src/dungeon.c | 60 | ||||
-rw-r--r-- | src/util.c | 30 |
3 files changed, 2 insertions, 93 deletions
diff --git a/src/config.h b/src/config.h index 23b3c1e4..4b91ed0b 100644 --- a/src/config.h +++ b/src/config.h @@ -153,11 +153,6 @@ /* - * OPTION: Hack -- Compile in support for "Cyborg" mode - */ -/*#define ALLOW_BORG*/ - -/* * OPTION: Hack -- Compile in support for "Wizard Commands" */ #define ALLOW_WIZARD diff --git a/src/dungeon.c b/src/dungeon.c index 6025ee45..fd5afeb9 100644 --- a/src/dungeon.c +++ b/src/dungeon.c @@ -3528,45 +3528,6 @@ extern void do_cmd_debug(void); #endif /* ALLOW_WIZARD */ -#ifdef ALLOW_BORG - -/* - * Verify use of "borg" commands - */ -static bool enter_borg_mode(void) -{ - /* Ask first time */ - if (!(noscore & 0x0010)) - { - /* Mention effects */ - msg_print("The borg commands are for debugging and experimenting."); - msg_print("The game will not be scored if you use borg commands."); - msg_print(NULL); - - /* Verify request */ - if (!get_check("Are you sure you want to use borg commands? ")) - { - return (FALSE); - } - - /* Mark savefile */ - noscore |= 0x0010; - } - - /* Success */ - return (TRUE); -} - - -/* - * Hack -- Declare the Ben Borg - */ -extern void do_cmd_borg(void); - -#endif /* ALLOW_BORG */ - - - /* * Parse and execute the current command * Give "Warning" on illegal commands. @@ -3654,25 +3615,8 @@ static void process_command(void) #endif /* ALLOW_WIZARD */ - -#ifdef ALLOW_BORG - - /* Special "borg" commands */ - case KTRL('Z'): - { - /* Enter borg mode */ - if (enter_borg_mode()) - { - if (!p_ptr->wild_mode) do_cmd_borg(); - } - - break; - } - -#endif /* ALLOW_BORG */ - - - /*** Inventory Commands ***/ + + /*** Inventory Commands ***/ /* Wear/wield equipment */ case 'w': @@ -1927,20 +1927,6 @@ static char inkey_aux(void) static cptr inkey_next = NULL; -#ifdef ALLOW_BORG - -/* -* Mega-Hack -- special "inkey_hack" hook. XXX XXX XXX -* -* This special function hook allows the "Borg" (see elsewhere) to take -* control of the "inkey()" function, and substitute in fake keypresses. -*/ -char (*inkey_hack)(int flush_first) = NULL; - -#endif /* ALLOW_BORG */ - - - /* * Get a keypress from the user. * @@ -2033,22 +2019,6 @@ char inkey(void) inkey_next = NULL; -#ifdef ALLOW_BORG - - /* Mega-Hack -- Use the special hook */ - if (inkey_hack && ((ch = (*inkey_hack)(inkey_xtra)) != 0)) - { - /* Cancel the various "global parameters" */ - inkey_base = inkey_xtra = inkey_flag = inkey_scan = FALSE; - - /* Accept result */ - macro_recorder_add(ch); - return (ch); - } - -#endif /* ALLOW_BORG */ - - /* Hack -- handle delayed "flush()" */ if (inkey_xtra) { |