From c514e1b152fe9e6a043941a4a8f35cf6548845ca Mon Sep 17 00:00:00 2001
From: Hourier <hourier@users.sourceforge.jp>
Date: Sat, 27 Jun 2020 13:07:59 +0900
Subject: [PATCH] [Refactor] #40483 Moved update_playtime() from
 display-main-window.c/h to world.c/h

---
 src/cmd-io/cmd-autopick.c            |  1 -
 src/cmd-visual/cmd-draw.c            |  1 +
 src/dungeon/quest.c                  |  1 -
 src/io/save.c                        |  1 -
 src/view/display-main-window.c       | 14 +-------------
 src/view/display-main-window.h       |  1 -
 src/world/world-movement-processor.c |  1 -
 src/world/world.c                    | 12 ++++++++++++
 src/world/world.h                    |  1 +
 9 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/cmd-io/cmd-autopick.c b/src/cmd-io/cmd-autopick.c
index 3eccc58fe..445164ff7 100644
--- a/src/cmd-io/cmd-autopick.c
+++ b/src/cmd-io/cmd-autopick.c
@@ -17,7 +17,6 @@
 #include "util/int-char-converter.h"
 #include "term/screen-processor.h"
 #include "world/world.h"
-#include "view/display-main-window.h" // 暫定。後で消す.
 
 /*
  * Check special key code and get a movement command id
diff --git a/src/cmd-visual/cmd-draw.c b/src/cmd-visual/cmd-draw.c
index 04db08956..32398f2df 100644
--- a/src/cmd-visual/cmd-draw.c
+++ b/src/cmd-visual/cmd-draw.c
@@ -15,6 +15,7 @@
 #include "view/display-main-window.h" // 暫定。後で消す.
 #include "view/display-messages.h"
 #include "view/display-player.h" // 暫定。後で消す.
+#include "world/world.h"
 
 /*!
  * @brief 画面を再描画するコマンドのメインルーチン
diff --git a/src/dungeon/quest.c b/src/dungeon/quest.c
index 765dc8b49..30bcfecd1 100644
--- a/src/dungeon/quest.c
+++ b/src/dungeon/quest.c
@@ -30,7 +30,6 @@
 #include "player/player-status.h"
 #include "system/system-variables.h"
 #include "util/bit-flags-calculator.h"
-#include "view/display-main-window.h"
 #include "view/display-messages.h"
 #include "world/world.h"
 
diff --git a/src/io/save.c b/src/io/save.c
index b1808f096..0f201c6dc 100644
--- a/src/io/save.c
+++ b/src/io/save.c
@@ -44,7 +44,6 @@
 #include "system/angband-version.h"
 #include "util/angband-files.h"
 #include "util/quarks.h"
-#include "view/display-main-window.h"
 #include "view/display-messages.h"
 #include "world/world.h"
 
diff --git a/src/view/display-main-window.c b/src/view/display-main-window.c
index 4efeebefb..94fe8ab65 100644
--- a/src/view/display-main-window.c
+++ b/src/view/display-main-window.c
@@ -69,7 +69,7 @@ concptr map_name(player_type *creature_ptr)
         return _("クエスト", "Quest");
     else if (creature_ptr->wild_mode)
         return _("地上", "Surface");
-    else if (creature_ptr->current_floor_ptr->inside_arena)
+    else if (floor_ptr->inside_arena)
         return _("アリーナ", "Arena");
     else if (creature_ptr->phase_out)
         return _("闘技場", "Monster Arena");
@@ -355,18 +355,6 @@ void object_kind_track(player_type *player_ptr, KIND_OBJECT_IDX k_idx)
     player_ptr->window |= (PW_OBJECT);
 }
 
-/*!
- * @brief 実ゲームプレイ時間を更新する
- */
-void update_playtime(void)
-{
-    if (current_world_ptr->start_time != 0) {
-        u32b tmp = (u32b)time(NULL);
-        current_world_ptr->play_time += (tmp - current_world_ptr->start_time);
-        current_world_ptr->start_time = tmp;
-    }
-}
-
 /*
  * Determines if a map location is currently "on screen" -RAK-
  * Note that "panel_contains(Y,X)" always implies "in_bounds2(Y,X)".
diff --git a/src/view/display-main-window.h b/src/view/display-main-window.h
index bfa676860..f643017f7 100644
--- a/src/view/display-main-window.h
+++ b/src/view/display-main-window.h
@@ -13,6 +13,5 @@ void monster_race_track(player_type *player_ptr, MONRACE_IDX r_idx);
 void object_kind_track(player_type *player_ptr, KIND_OBJECT_IDX k_idx);
 void resize_map(void);
 bool change_panel(player_type *player_ptr, POSITION dy, POSITION dx);
-void update_playtime(void);
 bool panel_contains(POSITION y, POSITION x);
 void delayed_visual_update(player_type *player_ptr);
diff --git a/src/world/world-movement-processor.c b/src/world/world-movement-processor.c
index 13068624a..671030877 100644
--- a/src/world/world-movement-processor.c
+++ b/src/world/world-movement-processor.c
@@ -11,7 +11,6 @@
 #include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "player/player-move.h"
-#include "view/display-main-window.h"
 #include "view/display-messages.h"
 #include "world/world.h"
 
diff --git a/src/world/world.c b/src/world/world.c
index 9790a04a1..bafa0c666 100644
--- a/src/world/world.c
+++ b/src/world/world.c
@@ -46,3 +46,15 @@ void extract_day_hour_min(player_type *player_ptr, int *day, int *hour, int *min
 	*hour = (24 * turn_in_today / A_DAY) % 24;
 	*min = (1440 * turn_in_today / A_DAY) % 60;
 }
+
+/*!
+ * @brief 実ゲームプレイ時間を更新する
+ */
+void update_playtime(void)
+{
+    if (current_world_ptr->start_time != 0) {
+        u32b tmp = (u32b)time(NULL);
+        current_world_ptr->play_time += (tmp - current_world_ptr->start_time);
+        current_world_ptr->start_time = tmp;
+    }
+}
diff --git a/src/world/world.h b/src/world/world.h
index 53df2e631..572a0f3e0 100644
--- a/src/world/world.h
+++ b/src/world/world.h
@@ -73,3 +73,4 @@ extern world_type *current_world_ptr;
 
 bool is_daytime(void);
 void extract_day_hour_min(player_type *player_ptr, int *day, int *hour, int *min);
+void update_playtime(void);
-- 
2.11.0