[Refactor] #2083 グローバル関数update_melee_gladiators() を廃止した

diff --git a/src/birth/game-play-initializer.cpp b/src/birth/game-play-initializer.cpp
index e202158..19b9242 100644 (file)
--- a/src/birth/game-play-initializer.cpp
+++ b/src/birth/game-play-initializer.cpp
@@ -7,7 +7,6 @@
 #include "info-reader/fixed-map-parser.h"
 #include "inventory/inventory-slot-types.h"
 #include "market/arena-entry.h"
-#include "market/melee-arena.h"
 #include "pet/pet-util.h"
 #include "player-base/player-class.h"
 #include "player-base/player-race.h"
@@ -17,6 +16,7 @@
 #include "player/player-spell-status.h"
 #include "system/artifact-type-definition.h"
 #include "system/baseitem-info.h"
+#include "system/building-type-definition.h"
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/inner-game-data.h"
@@ -129,7 +129,8 @@ void player_wipe_without_name(PlayerType *player_ptr)
     ArenaEntryList::get_instance().reset_entry();
     world.set_arena(true);
     world.knows_daily_bounty = false;
-    update_melee_gladiators(player_ptr);
+    auto &melee_arena = MeleeArena::get_instance();
+    melee_arena.update_gladiators(player_ptr);
     player_ptr->muta.clear();
 
     for (int i = 0; i < 8; i++) {

diff --git a/src/dungeon/dungeon-processor.cpp b/src/dungeon/dungeon-processor.cpp
index 31e1f9a..36018b0 100644 (file)
--- a/src/dungeon/dungeon-processor.cpp
+++ b/src/dungeon/dungeon-processor.cpp
@@ -18,7 +18,6 @@
 #include "io/cursor.h"
 #include "io/input-key-requester.h"
 #include "io/write-diary.h"
-#include "market/melee-arena.h"
 #include "mind/mind-ninja.h"
 #include "monster/monster-compaction.h"
 #include "monster/monster-processor.h"
@@ -31,6 +30,7 @@
 #include "realm/realm-song.h"
 #include "spell-realm/spells-song.h"
 #include "system/angband-system.h"
+#include "system/building-type-definition.h"
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/monster-race-info.h"
@@ -164,7 +164,8 @@ void process_dungeon(PlayerType *player_ptr, bool load_game)
     if (is_watching) {
         if (load_game) {
             player_ptr->energy_need = 0;
-            update_melee_gladiators(player_ptr);
+            auto &melee_arena = MeleeArena::get_instance();
+            melee_arena.update_gladiators(player_ptr);
         } else {
             msg_print(_("試合開始！", "Ready..Fight!"));
             msg_print(nullptr);

diff --git a/src/load/player-info-loader.cpp b/src/load/player-info-loader.cpp
index 14d23f6..9d97d34 100644 (file)
--- a/src/load/player-info-loader.cpp
+++ b/src/load/player-info-loader.cpp
@@ -10,7 +10,6 @@
 #include "load/savedata-old-flag-types.h"
 #include "load/world-loader.h"
 #include "market/arena-entry.h"
-#include "market/melee-arena.h"
 #include "monster-race/race-ability-flags.h"
 #include "mutation/mutation-calculator.h"
 #include "object/tval-types.h"
@@ -23,6 +22,7 @@
 #include "spell-realm/spells-song.h"
 #include "system/angband-exceptions.h"
 #include "system/angband-system.h"
+#include "system/building-type-definition.h"
 #include "system/dungeon-info.h"
 #include "system/floor-type-definition.h"
 #include "system/inner-game-data.h"
@@ -272,7 +272,8 @@ static void rd_phase_out(PlayerType *player_ptr)
 static void rd_arena(PlayerType *player_ptr)
 {
     if (h_older_than(0, 0, 3)) {
-        update_melee_gladiators(player_ptr);
+        auto &melee_arena = MeleeArena::get_instance();
+        melee_arena.update_gladiators(player_ptr);
     } else {
         set_gambling_monsters();
     }

diff --git a/src/market/melee-arena.cpp b/src/market/melee-arena.cpp
index dcfb9f8..24c5fa0 100644 (file)
--- a/src/market/melee-arena.cpp
+++ b/src/market/melee-arena.cpp
@@ -22,16 +22,6 @@
 #include <algorithm>
 
 /*!
- * @brief モンスター闘技場に参加するモンスターを更新する。
- * @param player_ptr プレイヤーへの参照ポインタ
- */
-void update_melee_gladiators(PlayerType *player_ptr)
-{
-    auto &melee_arena = MeleeArena::get_instance();
-    melee_arena.update_gladiators(player_ptr);
-}
-
-/*!
  * @brief モンスター闘技場のメインルーチン
  * @param player_ptr プレイヤーへの参照ポインタ
  * @return 賭けを開始したか否か
@@ -40,7 +30,8 @@ bool melee_arena_comm(PlayerType *player_ptr)
 {
     auto &world = AngbandWorld::get_instance();
     if ((world.game_turn - world.arena_start_turn) > TURNS_PER_TICK * 250) {
-        update_melee_gladiators(player_ptr);
+        auto &melee_arena = MeleeArena::get_instance();
+        melee_arena.update_gladiators(player_ptr);
         world.arena_start_turn = world.game_turn;
     }
 

diff --git a/src/market/melee-arena.h b/src/market/melee-arena.h
index 5e21438..84dd3ed 100644 (file)
--- a/src/market/melee-arena.h
+++ b/src/market/melee-arena.h
@@ -1,5 +1,4 @@
 #pragma once
 
 class PlayerType;
-void update_melee_gladiators(PlayerType *player_ptr);
 bool melee_arena_comm(PlayerType *player_ptr);

diff --git a/src/system/building-type-definition.cpp b/src/system/building-type-definition.cpp
index 0410ab5..2882a9e 100644 (file)
--- a/src/system/building-type-definition.cpp
+++ b/src/system/building-type-definition.cpp
@@ -51,6 +51,10 @@ const std::array<MeleeGladiator, NUM_GLADIATORS> &MeleeArena::get_gladiators() c
     return this->gladiators;
 }
 
+/*!
+ * @brief モンスター闘技場に参加するモンスターを更新する。
+ * @param player_ptr プレイヤーへの参照ポインタ
+ */
 void MeleeArena::update_gladiators(PlayerType *player_ptr)
 {
     const auto mon_level = this->decide_max_level();

diff --git a/src/wizard/wizard-game-modifier.cpp b/src/wizard/wizard-game-modifier.cpp
index e785c76..f7e9927 100644 (file)
--- a/src/wizard/wizard-game-modifier.cpp
+++ b/src/wizard/wizard-game-modifier.cpp
@@ -8,9 +8,9 @@
 #include "dungeon/quest.h"
 #include "info-reader/fixed-map-parser.h"
 #include "io/input-key-requester.h"
-#include "market/melee-arena.h"
 #include "monster-race/race-indice-types.h"
 #include "player-info/self-info.h"
+#include "system/building-type-definition.h"
 #include "system/floor-type-definition.h"
 #include "system/monster-race-info.h"
 #include "system/player-type-definition.h"
@@ -78,9 +78,11 @@ void wizard_game_modifier(PlayerType *player_ptr)
     case '\n':
     case '\r':
         break;
-    case 'g':
-        update_melee_gladiators(player_ptr);
+    case 'g': {
+        auto &melee_arena = MeleeArena::get_instance();
+        melee_arena.update_gladiators(player_ptr);
         break;
+    }
     case 'q':
         wiz_complete_quest(player_ptr);
         break;

diff --git a/src/world/world-turn-processor.cpp b/src/world/world-turn-processor.cpp
index f1ba8f7..536c29c 100644 (file)
--- a/src/world/world-turn-processor.cpp
+++ b/src/world/world-turn-processor.cpp
@@ -16,7 +16,6 @@
 #include "inventory/recharge-processor.h"
 #include "io/write-diary.h"
 #include "market/bounty.h"
-#include "market/melee-arena.h"
 #include "monster-floor/monster-generator.h"
 #include "monster-floor/monster-summon.h"
 #include "monster/monster-describer.h"
@@ -159,7 +158,8 @@ void WorldTurnProcessor::process_monster_arena()
         msg_print(_("相打ちに終わりました。", "Nothing survived."));
         msg_print(nullptr);
         this->player_ptr->energy_need = 0;
-        update_melee_gladiators(this->player_ptr);
+        auto &melee_arena = MeleeArena::get_instance();
+        melee_arena.update_gladiators(player_ptr);
         return;
     }
 
@@ -188,7 +188,8 @@ void WorldTurnProcessor::process_monster_arena_winner(int win_m_idx)
 
     msg_print(nullptr);
     this->player_ptr->energy_need = 0;
-    update_melee_gladiators(this->player_ptr);
+    auto &melee_arena = MeleeArena::get_instance();
+    melee_arena.update_gladiators(player_ptr);
 }
 
 void WorldTurnProcessor::process_monster_arena_draw()
@@ -202,7 +203,8 @@ void WorldTurnProcessor::process_monster_arena_draw()
     this->player_ptr->au += wager_melee;
     msg_print(nullptr);
     this->player_ptr->energy_need = 0;
-    update_melee_gladiators(this->player_ptr);
+    auto &melee_arena = MeleeArena::get_instance();
+    melee_arena.update_gladiators(player_ptr);
 }
 
 void WorldTurnProcessor::decide_auto_save()