[Refactor] #37353 macro__* の実体を util.c へ移動．

diff --git a/src/util.c b/src/util.c
index cae86e7..ac0cfeb 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -62,6 +62,32 @@ u32b *message__ptr;
  */
 char *message__buf;
 
+/*
+ * Number of active macros.
+ */
+s16b macro__num;
+
+/*
+ * Array of macro patterns [MACRO_MAX]
+ */
+concptr *macro__pat;
+
+/*
+ * Array of macro actions [MACRO_MAX]
+ */
+concptr *macro__act;
+
+/*
+ * Array of macro types [MACRO_MAX]
+ */
+bool *macro__cmd;
+
+/*
+ * Current macro action [1024]
+ */
+char *macro__buf;
+
+
 bool inkey_base;               /* See the "inkey()" function */
 bool inkey_xtra;               /* See the "inkey()" function */
 bool inkey_scan;               /* See the "inkey()" function */

diff --git a/src/variable.c b/src/variable.c
index 06429ea..38ad249 100644 (file)
--- a/src/variable.c
+++ b/src/variable.c
@@ -88,33 +88,6 @@ char savefile_base[40];
 
 pos_list tmp_pos;
 
-
-/*
- * Number of active macros.
- */
-s16b macro__num;
-
-/*
- * Array of macro patterns [MACRO_MAX]
- */
-concptr *macro__pat;
-
-/*
- * Array of macro actions [MACRO_MAX]
- */
-concptr *macro__act;
-
-/*
- * Array of macro types [MACRO_MAX]
- */
-bool *macro__cmd;
-
-/*
- * Current macro action [1024]
- */
-char *macro__buf;
-
-
 /*
  * The number of quarks
  */