[Fix] #38997 前回マージ後の英語版ビルドエラーを修正. / Fixed English build error after previous merge.

diff --git a/src/combat/melee1.c b/src/combat/melee1.c
index a9630e1..40e81b6 100644 (file)
--- a/src/combat/melee1.c
+++ b/src/combat/melee1.c
@@ -4055,7 +4055,7 @@ bool make_attack_normal(player_type *target_ptr, MONSTER_IDX m_idx)
                GAME_TEXT m_name_self[80];
 
                /* hisself */
-               monster_desc(m_name_self, m_ptr, MD_PRON_VISIBLE | MD_POSSESSIVE | MD_OBJECTIVE);
+               monster_desc(target_ptr, m_name_self, m_ptr, MD_PRON_VISIBLE | MD_POSSESSIVE | MD_OBJECTIVE);
 
                msg_format("The attack of %s has wounded %s!", m_name, m_name_self);
 #endif

diff --git a/src/files.c b/src/files.c
index 9671880..6c1cfbb 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -4821,7 +4821,7 @@ static void dump_aux_home_museum(player_type *creature_ptr, FILE *fff)
                fprintf(fff, "%c) %s\n", I2A(i % 12), o_name);
 #else
                if ((i % 12) == 0) fprintf(fff, "\n ( page %d )\n", x++);
-               object_desc(player_ptr, o_name, &st_ptr->stock[i], 0);
+               object_desc(creature_ptr, o_name, &st_ptr->stock[i], 0);
                fprintf(fff, "%c) %s\n", I2A(i % 12), o_name);
 #endif
        }

diff --git a/src/monster-process.c b/src/monster-process.c
index c239ae5..138389d 100644 (file)
--- a/src/monster-process.c
+++ b/src/monster-process.c
@@ -1262,7 +1262,7 @@ void process_monster(player_type *target_ptr, MONSTER_IDX m_idx)
                        msg_print("地面に落とされた。");
 #else
                        GAME_TEXT m_name[MAX_NLEN];
-                       monster_desc(m_name, &target_ptr->current_floor_ptr->m_list[target_ptr->riding], 0);
+                       monster_desc(target_ptr, m_name, &target_ptr->current_floor_ptr->m_list[target_ptr->riding], 0);
                        msg_format("You have fallen from %s.", m_name);
 #endif
                }

diff --git a/src/monster-status.c b/src/monster-status.c
index b8185b6..13e2977 100644 (file)
--- a/src/monster-status.c
+++ b/src/monster-status.c
@@ -744,13 +744,11 @@ static void process_monsters_mtimed_aux(player_type *target_ptr, MONSTER_IDX m_i
                if (is_seen(m_ptr))
                {
                        GAME_TEXT m_name[MAX_NLEN];
-#ifdef JP
-#else
-
+#ifndef JP
                        char m_poss[80];
 
                        /* Acquire the monster possessive */
-                       monster_desc(m_poss, m_ptr, MD_PRON_VISIBLE | MD_POSSESSIVE);
+                       monster_desc(target_ptr, m_poss, m_ptr, MD_PRON_VISIBLE | MD_POSSESSIVE);
 #endif
                        monster_desc(target_ptr, m_name, m_ptr, 0);
 #ifdef JP

diff --git a/src/monster1.c b/src/monster1.c
index 482a102..3c3d1a7 100644 (file)
--- a/src/monster1.c
+++ b/src/monster1.c
@@ -609,27 +609,29 @@ static void roff_aux(player_type *player_ptr, MONRACE_IDX r_idx, BIT_FLAGS mode)
 #ifdef JP
                        hooked_roff(format(" %d レベルのキャラクタにとって 約%ld.%02ld ポイントの経験となる。", player_ptr->lev, (long)i, (long)j));
 #else
-
-                       /* Mention the experience */
-                       hooked_roff(format(" is worth about %ld.%02ld point%s",
-                               (long)i, (long)j, ((i == 1) && (j == 0)) ? "" : "s"));
-
-                       /* Take account of annoying English */
-                       p = "th";
-                       i = player_ptr->lev % 10;
-                       if ((player_ptr->lev / 10) == 1) /* nothing */;
-                       else if (i == 1) p = "st";
-                       else if (i == 2) p = "nd";
-                       else if (i == 3) p = "rd";
-
-                       /* Take account of "leading vowels" in numbers */
-                       q = "";
-                       i = player_ptr->lev;
-                       if ((i == 8) || (i == 11) || (i == 18)) q = "n";
-
-                       /* Mention the dependance on the player's level */
-                       hooked_roff(format(" for a%s %lu%s level character.  ",
-                               q, (long)i, p));
+                       {
+                               char *p, *q;
+                               /* Mention the experience */
+                               hooked_roff(format(" is worth about %ld.%02ld point%s",
+                                       (long)i, (long)j, ((i == 1) && (j == 0)) ? "" : "s"));
+
+                               /* Take account of annoying English */
+                               p = "th";
+                               i = player_ptr->lev % 10;
+                               if ((player_ptr->lev / 10) == 1) /* nothing */;
+                               else if (i == 1) p = "st";
+                               else if (i == 2) p = "nd";
+                               else if (i == 3) p = "rd";
+
+                               /* Take account of "leading vowels" in numbers */
+                               q = "";
+                               i = player_ptr->lev;
+                               if ((i == 8) || (i == 11) || (i == 18)) q = "n";
+
+                               /* Mention the dependance on the player's level */
+                               hooked_roff(format(" for a%s %lu%s level character.  ",
+                                       q, (long)i, p));
+                       }
 #endif
 
                }

diff --git a/src/mspells1.c b/src/mspells1.c
index f7d203f..e99116b 100644 (file)
--- a/src/mspells1.c
+++ b/src/mspells1.c
@@ -1639,11 +1639,9 @@ bool make_attack_spell(MONSTER_IDX m_idx, player_type *target_ptr)
        GAME_TEXT m_name[MAX_NLEN];
        monster_desc(target_ptr, m_name, m_ptr, 0x00);
 
-#ifdef JP
-#else
-
+#ifndef JP
        /* Get the monster possessive ("his"/"her"/"its") */
-       monster_desc(m_poss, m_ptr, MD_PRON_VISIBLE | MD_POSSESSIVE);
+       monster_desc(target_ptr, m_poss, m_ptr, MD_PRON_VISIBLE | MD_POSSESSIVE);
 #endif
 
        SPELL_IDX thrown_spell = 0;

diff --git a/src/mspells2.c b/src/mspells2.c
index 3f02451..07f185d 100644 (file)
--- a/src/mspells2.c
+++ b/src/mspells2.c
@@ -663,11 +663,9 @@ bool monst_spell_monst(player_type *target_ptr, MONSTER_IDX m_idx)
        /* Get the monster name (or "it") */
        monster_desc(target_ptr, m_name, m_ptr, 0x00);
 
-#ifdef JP
-#else
-
+#ifndef JP
        /* Get the monster possessive ("his"/"her"/"its") */
-       monster_desc(m_poss, m_ptr, MD_PRON_VISIBLE | MD_POSSESSIVE);
+       monster_desc(target_ptr, m_poss, m_ptr, MD_PRON_VISIBLE | MD_POSSESSIVE);
 #endif
 
        /* Get the target's name (or "it") */