• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

変愚蛮怒のメインリポジトリです


Commit MetaInfo

Revisionb4cc14f13c3c5049775bf46f5e540cdf6c6ed405 (tree)
Time2019-05-19 15:56:14
Authordeskull <deskull@user...>
Commiterdeskull

Log Message

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

Change Summary

Incremental Difference

--- a/src/externs.h
+++ b/src/externs.h
@@ -45,21 +45,13 @@ extern const byte adj_chr_chm[];
4545
4646 /* variable.c */
4747
48-extern COMMAND_CODE command_cmd;
49-extern COMMAND_ARG command_arg;
50-extern s16b command_rep;
51-extern DIRECTION command_dir;
52-extern s16b command_see;
53-extern TERM_LEN command_gap;
54-extern s16b command_wrk;
55-extern s16b command_new;
56-
5748 extern bool repair_monsters;
5849 extern bool repair_objects;
5950
6051 extern bool reset_concent;
6152
6253
54+
6355 /*
6456 * Software options (set via the '=' command). See "tables.c"
6557 */
--- a/src/util.c
+++ b/src/util.c
@@ -93,8 +93,6 @@ char *macro__buf;
9393
9494 bool get_com_no_macros = FALSE; /* Expand macros in "get_com" or not */
9595
96-
97-
9896 bool inkey_base; /* See the "inkey()" function */
9997 bool inkey_xtra; /* See the "inkey()" function */
10098 bool inkey_scan; /* See the "inkey()" function */
@@ -112,6 +110,16 @@ concptr macro_modifier_name[MAX_MACRO_MOD]; /*!< マクロ上で取り扱う特
112110 concptr macro_trigger_name[MAX_MACRO_TRIG]; /*!< マクロのトリガーコード */
113111 concptr macro_trigger_keycode[2][MAX_MACRO_TRIG]; /*!< マクロの内容 */
114112
113+s16b command_cmd; /* Current "Angband Command" */
114+COMMAND_ARG command_arg; /*!< 各種コマンドの汎用的な引数として扱う / Gives argument of current command */
115+COMMAND_NUM command_rep; /*!< 各種コマンドの汎用的なリピート数として扱う / Gives repetition of current command */
116+DIRECTION command_dir; /*!< 各種コマンドの汎用的な方向値処理として扱う/ Gives direction of current command */
117+s16b command_see; /* See "object1.c" */
118+s16b command_wrk; /* See "object1.c" */
119+TERM_LEN command_gap = 999; /* See "object1.c" */
120+s16b command_new; /* Command chaining from inven/equip view */
121+
122+
115123 #if 0
116124 #ifndef HAS_STRICMP
117125
--- a/src/util.h
+++ b/src/util.h
@@ -65,6 +65,16 @@ extern concptr macro_modifier_name[MAX_MACRO_MOD];
6565 extern concptr macro_trigger_name[MAX_MACRO_TRIG];
6666 extern concptr macro_trigger_keycode[2][MAX_MACRO_TRIG];
6767
68+extern COMMAND_CODE command_cmd;
69+extern COMMAND_ARG command_arg;
70+extern s16b command_rep;
71+extern DIRECTION command_dir;
72+extern s16b command_see;
73+extern TERM_LEN command_gap;
74+extern s16b command_wrk;
75+extern s16b command_new;
76+
77+
6878 /*
6979 * Hack -- conditional (or "bizarre") externs
7080 */
--- a/src/variable.c
+++ b/src/variable.c
@@ -13,18 +13,6 @@
1313 #include "angband.h"
1414 #include "geometry.h"
1515
16-s16b command_cmd; /* Current "Angband Command" */
17-
18-COMMAND_ARG command_arg; /*!< 各種コマンドの汎用的な引数として扱う / Gives argument of current command */
19-COMMAND_NUM command_rep; /*!< 各種コマンドの汎用的なリピート数として扱う / Gives repetition of current command */
20-DIRECTION command_dir; /*!< 各種コマンドの汎用的な方向値処理として扱う/ Gives direction of current command */
21-
22-s16b command_see; /* See "object1.c" */
23-s16b command_wrk; /* See "object1.c" */
24-
25-TERM_LEN command_gap = 999; /* See "object1.c" */
26-
27-s16b command_new; /* Command chaining from inven/equip view */
2816
2917 bool repair_monsters; /* Hack -- optimize detect monsters */
3018 bool repair_objects; /* Hack -- optimize detect objects */
Show on old repository browser