[Refactor] #40481 Moved now_message from input-key-processor.c/h to display-messages.c/h

diff --git a/src/io/input-key-processor.c b/src/io/input-key-processor.c
index 21ccab2..1bfcde2 100644 (file)
--- a/src/io/input-key-processor.c
+++ b/src/io/input-key-processor.c
@@ -86,9 +86,6 @@
 #include "wizard/wizard-spoiler.h"
 #include "world/world.h"
 
-// todo command-processor.h と util.h が相互依存している。後で別な場所に移す.
-COMMAND_CODE now_message;
-
 /*!
  * @brief ウィザードモードへの導入処理
  * / Verify use of "wizard" mode

diff --git a/src/io/input-key-processor.h b/src/io/input-key-processor.h
index 37f7896..f3c908e 100644 (file)
--- a/src/io/input-key-processor.h
+++ b/src/io/input-key-processor.h
@@ -2,7 +2,5 @@
 
 #include "system/angband.h"
 
-extern COMMAND_CODE now_message;
-
 bool enter_wizard_mode(player_type* player_ptr);
 void process_command(player_type* creature_ptr);

diff --git a/src/view/display-messages.c b/src/view/display-messages.c
index 8a8a950..7d135ce 100644 (file)
--- a/src/view/display-messages.c
+++ b/src/view/display-messages.c
@@ -6,7 +6,6 @@
 #include "game-option/map-screen-options.h"
 #include "game-option/option-flags.h"
 #include "io/input-key-acceptor.h"
-#include "io/input-key-processor.h"
 #include "main/sound-of-music.h"
 #include "term/gameterm.h"
 #include "term/term-color-types.h"
@@ -34,6 +33,8 @@ char *message__buf;
 /* Used in msg_print() for "buffering" */
 bool msg_flag;
 
+COMMAND_CODE now_message;
+
 /*!
  * @brief 保存中の過去ゲームメッセージの数を返す。 / How many messages are "available"?
  * @return 残っているメッセージの数

diff --git a/src/view/display-messages.h b/src/view/display-messages.h
index d2e7321..f48eba8 100644 (file)
--- a/src/view/display-messages.h
+++ b/src/view/display-messages.h
@@ -23,6 +23,7 @@ extern u32b *message__ptr;
 extern char *message__buf;
 
 extern bool msg_flag;
+extern COMMAND_CODE now_message;
 
 s32b message_num(void);
 concptr message_str(int age);

diff --git a/src/window/display-sub-windows.c b/src/window/display-sub-windows.c
index 33cdbc5..11b3b85 100644 (file)
--- a/src/window/display-sub-windows.c
+++ b/src/window/display-sub-windows.c
@@ -10,7 +10,6 @@
 #include "inventory/inventory-describer.h"
 #include "inventory/inventory-slot-types.h"
 #include "inventory/inventory-util.h"
-#include "io/input-key-processor.h"
 #include "io/targeting.h"
 #include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"