[Refactor] #37353 command_* を util.c/h に移動．

diff --git a/src/externs.h b/src/externs.h
index 777bbaf..167f7e6 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -45,21 +45,13 @@ extern const byte adj_chr_chm[];
 
 /* variable.c */
 
-extern COMMAND_CODE command_cmd;
-extern COMMAND_ARG command_arg;
-extern s16b command_rep;
-extern DIRECTION command_dir;
-extern s16b command_see;
-extern TERM_LEN command_gap;
-extern s16b command_wrk;
-extern s16b command_new;
-
 extern bool repair_monsters;
 extern bool repair_objects;
 
 extern bool reset_concent;
 
 
+
 /*
  * Software options (set via the '=' command).  See "tables.c"
  */

diff --git a/src/util.c b/src/util.c
index 3c1c5d6..5edd960 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -93,8 +93,6 @@ 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 */
 bool inkey_scan;               /* See the "inkey()" function */
@@ -112,6 +110,16 @@ concptr macro_modifier_name[MAX_MACRO_MOD]; /*!< マクロ上で取り扱う特
 concptr macro_trigger_name[MAX_MACRO_TRIG]; /*!< マクロのトリガーコード */
 concptr macro_trigger_keycode[2][MAX_MACRO_TRIG];  /*!< マクロの内容 */
 
+s16b command_cmd;              /* Current "Angband Command" */
+COMMAND_ARG command_arg;       /*!< 各種コマンドの汎用的な引数として扱う / Gives argument of current command */
+COMMAND_NUM command_rep;       /*!< 各種コマンドの汎用的なリピート数として扱う / Gives repetition of current command */
+DIRECTION command_dir;         /*!< 各種コマンドの汎用的な方向値処理として扱う/ Gives direction of current command */
+s16b command_see;              /* See "object1.c" */
+s16b command_wrk;              /* See "object1.c" */
+TERM_LEN command_gap = 999;         /* See "object1.c" */
+s16b command_new;              /* Command chaining from inven/equip view */
+
+
 #if 0
 #ifndef HAS_STRICMP
 

diff --git a/src/util.h b/src/util.h
index 6507c3a..fa51ee2 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -65,6 +65,16 @@ extern concptr macro_modifier_name[MAX_MACRO_MOD];
 extern concptr macro_trigger_name[MAX_MACRO_TRIG];
 extern concptr macro_trigger_keycode[2][MAX_MACRO_TRIG];
 
+extern COMMAND_CODE command_cmd;
+extern COMMAND_ARG command_arg;
+extern s16b command_rep;
+extern DIRECTION command_dir;
+extern s16b command_see;
+extern TERM_LEN command_gap;
+extern s16b command_wrk;
+extern s16b command_new;
+
+
 /*
  * Hack -- conditional (or "bizarre") externs
  */

diff --git a/src/variable.c b/src/variable.c
index e202f71..8937073 100644 (file)
--- a/src/variable.c
+++ b/src/variable.c
@@ -13,18 +13,6 @@
 #include "angband.h"
 #include "geometry.h"
 
-s16b command_cmd;              /* Current "Angband Command" */
-
-COMMAND_ARG command_arg;       /*!< 各種コマンドの汎用的な引数として扱う / Gives argument of current command */
-COMMAND_NUM command_rep;       /*!< 各種コマンドの汎用的なリピート数として扱う / Gives repetition of current command */
-DIRECTION command_dir;         /*!< 各種コマンドの汎用的な方向値処理として扱う/ Gives direction of current command */
-
-s16b command_see;              /* See "object1.c" */
-s16b command_wrk;              /* See "object1.c" */
-
-TERM_LEN command_gap = 999;         /* See "object1.c" */
-
-s16b command_new;              /* Command chaining from inven/equip view */
 
 bool repair_monsters;  /* Hack -- optimize detect monsters */
 bool repair_objects;   /* Hack -- optimize detect objects */