From b6f564af7b71330a967295cc60faed2eed21f3af Mon Sep 17 00:00:00 2001
From: Hourier <66951241+Hourier@users.noreply.github.com>
Date: Sun, 9 Jun 2024 11:56:03 +0900
Subject: [PATCH] =?utf8?q?[Refactor]=20ARENA=5FDEFEATED=5FOLD=5FVER=20?=
 =?utf8?q?=E3=82=92cmd-building.h=20=E3=81=8B=E3=82=89arena-entry.h=20?=
 =?utf8?q?=E3=81=AB=E7=A7=BB=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/cmd-building/cmd-building.h |  5 -----
 src/io-dump/character-dump.cpp  | 21 ++++++++++-----------
 src/load/player-info-loader.cpp |  2 +-
 src/market/arena-entry.h        |  3 +++
 4 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/src/cmd-building/cmd-building.h b/src/cmd-building/cmd-building.h
index 8e543aeed..1bce0ff25 100644
--- a/src/cmd-building/cmd-building.h
+++ b/src/cmd-building/cmd-building.h
@@ -9,11 +9,6 @@
 #define BUILDING_OWNER      2 /*!< 施設の種族/職業条件が一致している状態値 */
 // clang-format on
 
-/*
- * Arena constants
- */
-#define ARENA_DEFEATED_OLD_VER (-(MAX_SHORT)) /*<! 旧バージョンの闘技場敗北定義 */
-
 extern bool reinit_wilderness;
 
 extern uint32_t mon_odds[4];
diff --git a/src/io-dump/character-dump.cpp b/src/io-dump/character-dump.cpp
index 1bd7db8bd..9d61a2632 100644
--- a/src/io-dump/character-dump.cpp
+++ b/src/io-dump/character-dump.cpp
@@ -1,7 +1,6 @@
 #include "io-dump/character-dump.h"
 #include "artifact/fixed-art-types.h"
 #include "avatar/avatar.h"
-#include "cmd-building/cmd-building.h"
 #include "dungeon/quest.h"
 #include "flavor/flavor-describer.h"
 #include "floor/floor-town.h"
@@ -275,19 +274,19 @@ static void dump_aux_arena(PlayerType *player_ptr, FILE *fff)
     const auto &entries = ArenaEntryList::get_instance();
     const auto arena_number = player_ptr->arena_number;
     if (arena_number < 0) {
-        if (arena_number <= ARENA_DEFEATED_OLD_VER) {
-            fprintf(fff, _("\n 闘技場: 敗北\n", "\n Arena: Defeated\n"));
-        } else {
-            constexpr auto mes = _("\n 闘技場: %d回戦で%sの前に敗北\n", "\n Arena: Defeated by %s in the %d%s fight\n");
-            const auto &arena = arena_info[-1 - arena_number];
-            const auto &arena_monrace = monraces_info[arena.r_idx];
+        if (arena_number == ARENA_DEFEATED_OLD_VER) {
+            fprintf(fff, _("\n 闘技場: 敗北\n\n", "\n Arena: Defeated\n\n"));
+            return;
+        }
+
+        constexpr auto fmt = _("\n 闘技場: %d回戦で%sの前に敗北\n", "\n Arena: Defeated by %s in the %d%s fight\n");
+        const auto &arena = arena_info[-1 - arena_number];
+        const auto &arena_monrace = monraces_info[arena.r_idx];
 #ifdef JP
-            fprintf(fff, mes, -arena_number, arena_monrace.name.data());
+        fprintf(fff, fmt, -arena_number, arena_monrace.name.data());
 #else
-            fprintf(fff, mes, arena_monrace.name.data(), -arena_number, get_ordinal_number_suffix(-arena_number).data());
+        fprintf(fff, fmt, arena_monrace.name.data(), -arena_number, get_ordinal_number_suffix(-arena_number).data());
 #endif
-        }
-
         fprintf(fff, "\n");
         return;
     }
diff --git a/src/load/player-info-loader.cpp b/src/load/player-info-loader.cpp
index 2b7acf4c7..d066e89f9 100644
--- a/src/load/player-info-loader.cpp
+++ b/src/load/player-info-loader.cpp
@@ -1,5 +1,4 @@
 #include "load/player-info-loader.h"
-#include "cmd-building/cmd-building.h"
 #include "load/angband-version-comparer.h"
 #include "load/birth-loader.h"
 #include "load/dummy-loader.h"
@@ -10,6 +9,7 @@
 #include "load/player-class-specific-data-loader.h"
 #include "load/savedata-old-flag-types.h"
 #include "load/world-loader.h"
+#include "market/arena-entry.h"
 #include "market/arena.h"
 #include "monster-race/race-ability-flags.h"
 #include "mutation/mutation-calculator.h"
diff --git a/src/market/arena-entry.h b/src/market/arena-entry.h
index 82da1881d..a9c1285eb 100644
--- a/src/market/arena-entry.h
+++ b/src/market/arena-entry.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "system/baseitem-info.h"
+#include "system/h-type.h"
 #include <vector>
 
 /*!
@@ -37,3 +38,5 @@ private:
 };
 
 extern const std::vector<ArenaMonsterEntry> arena_info;
+
+constexpr auto ARENA_DEFEATED_OLD_VER = -MAX_SHORT; /*<! 旧バージョンの闘技場敗北定義 */
-- 
2.11.0