[Fix] #38997 英語版のコンパイルエラーを修正． / Fix compile error when English build.

diff --git a/src/bldg.c b/src/bldg.c
index e8200bf..d712184 100644 (file)
--- 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 228cbe5..835c568 100644 (file)
--- 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 9e04218..8a4bded 100644 (file)
--- 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 b83e83b..10bf76f 100644 (file)
--- 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 014d4c4..364eb03 100644 (file)
--- 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;