From c8fd9f7dc6fde4fc76426675a7432e437f62a94d Mon Sep 17 00:00:00 2001 From: Hourier Date: Fri, 24 Jul 2020 15:51:55 +0900 Subject: [PATCH] [Refactor] #40571 Declared show_gold_on_floor in targeting.h --- src/object/item-tester-hooker.c | 2 +- src/target/targeting.c | 4 ++-- src/target/targeting.h | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/object/item-tester-hooker.c b/src/object/item-tester-hooker.c index dc5f35566..2b0450049 100644 --- a/src/object/item-tester-hooker.c +++ b/src/object/item-tester-hooker.c @@ -6,6 +6,7 @@ #include "object/item-tester-hooker.h" #include "object/object-info.h" +#include "target/targeting.h" /* * Used during calls to "get_item()" and "show_inven()" and "show_equip()", and the choice window routines. @@ -24,7 +25,6 @@ bool item_tester_okay(player_type *player_ptr, object_type *o_ptr, tval_type tva return FALSE; if (o_ptr->tval == TV_GOLD) { - extern bool show_gold_on_floor; if (!show_gold_on_floor) return FALSE; } diff --git a/src/target/targeting.c b/src/target/targeting.c index 57b9608e4..acee4e4cd 100644 --- a/src/target/targeting.c +++ b/src/target/targeting.c @@ -79,6 +79,8 @@ #include "locale/english.h" #endif +bool show_gold_on_floor = FALSE; + /*! * @brief コンソール上におけるマップ表示の左上位置を返す / * Calculates current boundaries Called below and from "do_cmd_locate()". @@ -448,8 +450,6 @@ static void evaluate_monster_exp(player_type *creature_ptr, char *buf, monster_t sprintf(buf, "%03ld", (long int)num); } -bool show_gold_on_floor = FALSE; - /* * Examine a grid, return a keypress. * diff --git a/src/target/targeting.h b/src/target/targeting.h index cff1e2e35..769b1aec9 100644 --- a/src/target/targeting.h +++ b/src/target/targeting.h @@ -5,6 +5,7 @@ extern MONSTER_IDX target_who; extern POSITION target_col; extern POSITION target_row; +extern bool show_gold_on_floor; void panel_bounds_center(void); void verify_panel(player_type *creature_ptr); -- 2.11.0