From 268c549348f04f48cb7dbfbca7639711416360f1 Mon Sep 17 00:00:00 2001
From: deskull <deskull@users.sourceforge.jp>
Date: Tue, 14 Jan 2020 00:41:54 +0900
Subject: [PATCH] =?utf8?q?[Fix]=20#38997=20=E8=8B=B1=E8=AA=9E=E7=89=88?=
 =?utf8?q?=E3=81=AE=E3=82=B3=E3=83=B3=E3=83=91=E3=82=A4=E3=83=AB=E3=82=A8?=
 =?utf8?q?=E3=83=A9=E3=83=BC=E3=82=92=E4=BF=AE=E6=AD=A3=EF=BC=8E=20/=20Fix?=
 =?utf8?q?=20compile=20error=20when=20English=20build.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/bldg.c         | 2 +-
 src/cmd/cmd-item.c | 4 ++--
 src/core.c         | 2 +-
 src/files.c        | 2 ++
 src/realm-hex.c    | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/bldg.c b/src/bldg.c
index e8200bf15..d7121842c 100644
--- a/src/bldg.c
+++ b/src/bldg.c
@@ -2785,7 +2785,7 @@ static PRICE compare_weapons(player_type *customer_ptr, PRICE bcost)
 		put_str("(一番高いダメージが適用されます。複数の倍打効果は足し算されません。)", row + 4, 0);
 		prt("現在の技量から判断すると、あなたの武器は以下のような威力を発揮します:", 0, 0);
 #else
-		put_str(format("[ 's' Select secondary weapon($%d) ]", cost), row + 1, (wid * i + mgn));
+		put_str(format("[ 's' Select secondary weapon($%d) ]", cost), 1, (wid + mgn));
 		put_str("(Only highest damage applies per monster. Special damage not cumulative.)", row + 4, 0);
 		prt("Based on your current abilities, here is what your weapons will do", 0, 0);
 #endif
diff --git a/src/cmd/cmd-item.c b/src/cmd/cmd-item.c
index 228cbe5e4..835c56858 100644
--- a/src/cmd/cmd-item.c
+++ b/src/cmd/cmd-item.c
@@ -266,9 +266,9 @@ void do_cmd_wield(player_type *creature_ptr)
 	{
 		object_desc(o_name, &creature_ptr->inventory_list[slot], (OD_OMIT_PREFIX | OD_NAME_ONLY));
 #ifdef JP
-		msg_format("%s%sは呪われているようだ。", describe_use(creature_ptr, slot) , o_name);
+		msg_format("%s%sは呪われているようだ。", describe_use(creature_ptr, slot), o_name);
 #else
-		msg_format("The %s you are %s appears to be cursed.", o_name, describe_use(slot));
+		msg_format("The %s you are %s appears to be cursed.", o_name, describe_use(creature_ptr, slot));
 #endif
 		return;
 	}
diff --git a/src/core.c b/src/core.c
index 9e0421832..8a4bdedcc 100644
--- a/src/core.c
+++ b/src/core.c
@@ -215,7 +215,7 @@ static void sense_inventory_aux(player_type *creature_ptr, INVENTORY_IDX slot, b
 			describe_use(creature_ptr, slot), o_name, index_to_label(slot), game_inscriptions[feel]);
 #else
 		msg_format("You feel the %s (%c) you are %s %s %s...",
-			o_name, index_to_label(slot), describe_use(slot),
+			o_name, index_to_label(slot), describe_use(creature_ptr, slot),
 			((o_ptr->number == 1) ? "is" : "are"),
 			game_inscriptions[feel]);
 #endif
diff --git a/src/files.c b/src/files.c
index b83e83bf1..10bf76fb8 100644
--- a/src/files.c
+++ b/src/files.c
@@ -6075,10 +6075,12 @@ void print_tomb(player_type *dead_ptr)
 
 	roff_to_buf(format("by %s.", dead_ptr->died_from), GRAVE_LINE_WIDTH + 1, tmp, sizeof tmp);
 	center_string(buf, tmp);
+	char *t;
 	put_str(buf, 15, 11);
 	t = tmp + strlen(tmp) + 1;
 	if (*t)
 	{
+		char dummy[80];
 		strcpy(dummy, t); /* 2nd line */
 		if (*(t + strlen(t) + 1)) /* Does 3rd line exist? */
 		{
diff --git a/src/realm-hex.c b/src/realm-hex.c
index 014d4c4e7..364eb03fb 100644
--- a/src/realm-hex.c
+++ b/src/realm-hex.c
@@ -987,7 +987,7 @@ concptr do_hex_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode)
 #ifdef JP
 			msg_print("武器の渇望が消え去った。");
 #else
-			msg_format("Your weapon%s less thirsty now.", (empty_hands(FALSE)) ? " is" : "s are");
+			msg_format("Your weapon%s less thirsty now.", (empty_hands(caster_ptr, FALSE)) ? " is" : "s are");
 #endif
 		}
 		break;
-- 
2.11.0