From e76309cb4009287e1ab16b129a7b582f482e8da3 Mon Sep 17 00:00:00 2001 From: Hourier <66951241+Hourier@users.noreply.github.com> Date: Fri, 30 Dec 2022 10:56:45 +0900 Subject: [PATCH] [Refactor] #3037 Separated display_reparing_weapon() from repair_broken_weapon_aux() --- src/market/building-craft-fix.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/market/building-craft-fix.cpp b/src/market/building-craft-fix.cpp index 7c2335a53..373edb341 100644 --- a/src/market/building-craft-fix.cpp +++ b/src/market/building-craft-fix.cpp @@ -112,6 +112,13 @@ static std::pair select_repairing_broken_weapon(PlayerType * return { true, o_ptr }; } +static void display_reparing_weapon(PlayerType *player_ptr, ItemEntity *o_ptr, const int row) +{ + char item_name[MAX_NLEN]; + describe_flavor(player_ptr, item_name, o_ptr, OD_NAME_ONLY); + prt(format(_("修復する武器 : %s", "Repairing: %s"), item_name), row + 3, 2); +} + static void display_repair_success_message(PlayerType *player_ptr, ItemEntity *o_ptr, const int cost) { char item_name[MAX_NLEN]; @@ -140,9 +147,7 @@ static PRICE repair_broken_weapon_aux(PlayerType *player_ptr, PRICE bcost) return 0; } - char basenm[MAX_NLEN]; - describe_flavor(player_ptr, basenm, o_ptr, OD_NAME_ONLY); - prt(format(_("修復する武器 : %s", "Repairing: %s"), basenm), row + 3, 2); + display_reparing_weapon(player_ptr, o_ptr, row); const auto q = _("材料となる武器は?", "Which weapon for material? "); const auto s = _("材料となる武器がありません。", "You have no material for the repair."); short mater; @@ -156,6 +161,7 @@ static PRICE repair_broken_weapon_aux(PlayerType *player_ptr, PRICE bcost) return 0; } + char basenm[MAX_NLEN]; describe_flavor(player_ptr, basenm, mo_ptr, OD_NAME_ONLY); prt(format(_("材料とする武器: %s", "Material : %s"), basenm), row + 4, 2); const auto cost = bcost + object_value_real(o_ptr) * 2; -- 2.11.0