[Refactor] #37353 ALLOW_WIZARD のプリプロが有効であることを前提とし、プリプロ自体は削除 / Removed ALLOW_WIZARD...

diff --git a/src/core.c b/src/core.c
index a413d39..fce354e 100644 (file)
--- a/src/core.c
+++ b/src/core.c
@@ -3408,8 +3408,6 @@ static bool enter_wizard_mode(player_type *player_ptr)
 }
 
 
-#ifdef ALLOW_WIZARD
-
 /*!
  * @brief デバッグコマンドへの導入処理
  * / Verify use of "debug" commands
@@ -3454,9 +3452,6 @@ static bool enter_debug_mode(player_type *player_ptr)
  */
 extern void do_cmd_debug(player_type *creature_ptr);
 
-#endif /* ALLOW_WIZARD */
-
-
 #ifdef ALLOW_BORG
 
 /*!
@@ -3554,9 +3549,6 @@ static void process_command(player_type *creature_ptr)
                break;
        }
 
-
-#ifdef ALLOW_WIZARD
-
        /* Special "debug" commands */
        case KTRL('A'):
        {
@@ -3567,9 +3559,6 @@ static void process_command(player_type *creature_ptr)
                break;
        }
 
-#endif /* ALLOW_WIZARD */
-
-
 #ifdef ALLOW_BORG
 
        /* Special "borg" commands */

diff --git a/src/h-config.h b/src/h-config.h
index 849872b..562b674 100644 (file)
--- a/src/h-config.h
+++ b/src/h-config.h
@@ -414,11 +414,6 @@
 
 #ifdef USE_DEBUG
 
-/*!
- * @brief ウィザードモードへの移行を許可する / OPTION: Hack -- Compile in support for "Wizard Commands"
- */
-#define ALLOW_WIZARD
-
 #endif /* USE_DEBUG */
 
  /*

diff --git a/src/wizard2.c b/src/wizard2.c
index a664aa5..dcd1226 100644 (file)
--- a/src/wizard2.c
+++ b/src/wizard2.c
@@ -57,41 +57,6 @@
 
 extern void do_cmd_debug(player_type *creature_ptr);
 
-#ifdef ALLOW_WIZARD
-/*
-typedef struct debug_spell_commands1
-{
-       int type;
-       char *command;
-       bool(*spell_function_type1)(player_type *);
-} debug_spell_commands1;
-
-typedef struct debug_spell_commands2
-{
-       int type;
-       char *command;
-       bool(*spell_function_type2)(player_type *, floor_type *);
-} debug_spell_commands2;
-
-typedef struct debug_spell_commands3
-{
-       int type;
-       char *command;
-       bool(*spell_function_type3)(player_type *, HIT_POINT);
-} debug_spell_commands3;
-
-typedef union debug_spell_commands {
-       debug_spell_commands1 command1;
-       debug_spell_commands2 command2;
-       debug_spell_commands3 command3;
-} debug_spell_commands;
-
-debug_spell_commands debug_spell_commands_list[] =
-{
-       .command3 = {3, "true healing", true_healing}
-};
-*/
-
 typedef union spell_functions {
        struct debug_spell_type1 { bool(*spell_function)(player_type *, floor_type *); } spell1;
        struct debug_spell_type2 { bool(*spell_function)(player_type *); } spell2;
@@ -2012,10 +1977,6 @@ void do_cmd_debug(player_type *creature_ptr)
        }
 }
 
-#else
-
 #ifdef MACINTOSH
 static int i = 0;
 #endif
-
-#endif