• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

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


Commit MetaInfo

Revisioneefa4c7ba1d8f2e030003bccba151e6ae18d527d (tree)
Time2019-05-13 20:54:18
Authordeskull <deskull@user...>
Commiterdeskull

Log Message

[Refactor] #37353 init_flags, INIT_* フラグを core.h へ移動.

Change Summary

Incremental Difference

--- a/src/birth.c
+++ b/src/birth.c
@@ -14,6 +14,7 @@
1414 #include "angband.h"
1515 #include "util.h"
1616 #include "bldg.h"
17+#include "core.h"
1718
1819 #include "artifact.h"
1920 #include "avatar.h"
--- a/src/cmd-basic.c
+++ b/src/cmd-basic.c
@@ -12,6 +12,7 @@
1212
1313 #include "angband.h"
1414 #include "util.h"
15+#include "core.h"
1516
1617 #include "cmd-dump.h"
1718 #include "chest.h"
--- a/src/cmd-dump.c
+++ b/src/cmd-dump.c
@@ -44,6 +44,7 @@
4444 #include "cmd-dump.h"
4545 #include "term.h"
4646 #include "inet.h"
47+#include "core.h"
4748
4849 #include "autopick.h"
4950
--- a/src/core.c
+++ b/src/core.c
@@ -109,6 +109,11 @@ concptr ANGBAND_GRAF = "ascii"; //!< Hack -- The special Angband "Graphics Suffi
109109 static bool load = TRUE; /*!<ロード処理中の分岐フラグ*/
110110 static int wild_regen = 20; /*!<広域マップ移動時の自然回復処理カウンタ(広域マップ1マス毎に20回処理を基本とする)*/
111111
112+/*
113+ * Flags for initialization
114+ */
115+int init_flags;
116+
112117 /*!
113118 * @brief 擬似鑑定を実際に行い判定を反映する
114119 * @param slot 擬似鑑定を行うプレイヤーの所持リストID
--- a/src/core.h
+++ b/src/core.h
@@ -2,6 +2,18 @@
22
33 extern const concptr copyright[5];
44
5+
6+/*
7+ * Initialization flags
8+ */
9+#define INIT_NAME_ONLY 0x01
10+#define INIT_SHOW_TEXT 0x02
11+#define INIT_ASSIGN 0x04
12+#define INIT_CREATE_DUNGEON 0x08
13+#define INIT_ONLY_FEATURES 0x10
14+#define INIT_ONLY_BUILDINGS 0x20
15+extern int init_flags;
16+
517 extern concptr ANGBAND_SYS;
618 extern concptr ANGBAND_KEYBOARD;
719 extern concptr ANGBAND_GRAF;
--- a/src/defines.h
+++ b/src/defines.h
@@ -2591,15 +2591,6 @@ extern int PlayerUID;
25912591
25922592
25932593
2594-/*
2595- * Initialization flags
2596- */
2597-#define INIT_NAME_ONLY 0x01
2598-#define INIT_SHOW_TEXT 0x02
2599-#define INIT_ASSIGN 0x04
2600-#define INIT_CREATE_DUNGEON 0x08
2601-#define INIT_ONLY_FEATURES 0x10
2602-#define INIT_ONLY_BUILDINGS 0x20
26032594
26042595
26052596 /*
--- a/src/externs.h
+++ b/src/externs.h
@@ -112,7 +112,6 @@ extern monsterrace_hook_type get_mon_num_hook;
112112 extern monsterrace_hook_type get_mon_num2_hook;
113113 extern bool (*get_obj_num_hook)(KIND_OBJECT_IDX k_idx);
114114
115-extern int init_flags;
116115 extern int highscore_fd;
117116 extern bool can_save;
118117
--- a/src/floor-generate.c
+++ b/src/floor-generate.c
@@ -98,6 +98,7 @@
9898
9999 #include "angband.h"
100100 #include "util.h"
101+#include "core.h"
101102 #include "bldg.h"
102103
103104 #include "cmd-dump.h"
--- a/src/load.c
+++ b/src/load.c
@@ -42,8 +42,9 @@
4242
4343 #include "angband.h"
4444 #include "util.h"
45-#include "load.h"
45+#include "core.h"
4646
47+#include "load.h"
4748 #include "bldg.h"
4849 #include "report.h"
4950
--- a/src/targeting.c
+++ b/src/targeting.c
@@ -13,6 +13,7 @@
1313
1414 #include "angband.h"
1515 #include "util.h"
16+#include "core.h"
1617 #include "targeting.h"
1718
1819 #include "bldg.h"
--- a/src/variable.c
+++ b/src/variable.c
@@ -191,11 +191,6 @@ monsterrace_hook_type get_mon_num2_hook;
191191 */
192192 bool (*get_obj_num_hook)(KIND_OBJECT_IDX k_idx);
193193
194-/*
195- * Flags for initialization
196- */
197-int init_flags;
198-
199194
200195 /*
201196 * The "highscore" file descriptor, if available.
--- a/src/wild.c
+++ b/src/wild.c
@@ -12,6 +12,7 @@
1212
1313 #include "angband.h"
1414 #include "util.h"
15+#include "core.h"
1516
1617 #include "dungeon.h"
1718 #include "floor.h"
Show on old repository browser