[Refactor] #37353 get_com_no_macros を util.c/h へ移動．

diff --git a/src/externs.h b/src/externs.h
index 5d610dc..8143ec9 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -54,8 +54,6 @@ extern TERM_LEN command_gap;
 extern s16b command_wrk;
 extern s16b command_new;
 
-extern bool get_com_no_macros;
-
 extern bool repair_monsters;
 extern bool repair_objects;
 extern MONSTER_IDX hack_m_idx;

diff --git a/src/util.c b/src/util.c
index 68c1f39..1b5edd8 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -90,6 +90,9 @@ bool *macro__cmd;
  */
 char *macro__buf;
 
+bool get_com_no_macros = FALSE;        /* Expand macros in "get_com" or not */
+
+
 
 bool inkey_base;               /* See the "inkey()" function */
 bool inkey_xtra;               /* See the "inkey()" function */

diff --git a/src/util.h b/src/util.h
index 5b2e5f8..6507c3a 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -48,6 +48,8 @@ extern concptr *macro__act;
 extern bool *macro__cmd;
 extern char *macro__buf;
 
+extern bool get_com_no_macros;
+
 extern bool inkey_base;
 extern bool inkey_xtra;
 extern bool inkey_scan;

diff --git a/src/variable.c b/src/variable.c
index b203e70..6bf3323 100644 (file)
--- a/src/variable.c
+++ b/src/variable.c
@@ -26,8 +26,6 @@ TERM_LEN command_gap = 999;         /* See "object1.c" */
 
 s16b command_new;              /* Command chaining from inven/equip view */
 
-bool get_com_no_macros = FALSE;        /* Expand macros in "get_com" or not */
-
 bool repair_monsters;  /* Hack -- optimize detect monsters */
 bool repair_objects;   /* Hack -- optimize detect objects */