[Refactor] #37353 look_mon_desc() to monster1.c.

diff --git a/src/externs.h b/src/externs.h
index f0e576a..159a1b8 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -675,6 +675,7 @@ extern bool monster_can_enter(POSITION y, POSITION x, monster_race *r_ptr, BIT_F
 extern bool are_enemies(monster_type *m_ptr1, monster_type *m_ptr2);
 extern bool monster_has_hostile_align(monster_type *m_ptr, int pa_good, int pa_evil, monster_race *r_ptr);
 extern void dice_to_string(int base_damage, int dice_num, int dice_side, int dice_mult, int dice_div, char* msg);
+extern concptr look_mon_desc(monster_type *m_ptr, BIT_FLAGS mode);
 
 
 /* monster2.c */
@@ -1160,7 +1161,6 @@ extern bool change_panel(POSITION dy, POSITION dx);
 extern void get_screen_size(TERM_LEN *wid_p, TERM_LEN *hgt_p);
 extern void panel_bounds_center(void);
 extern void verify_panel(void);
-extern concptr look_mon_desc(monster_type *m_ptr, BIT_FLAGS mode);
 extern bool target_able(MONSTER_IDX m_idx);
 extern bool target_okay(void);
 extern bool target_set(BIT_FLAGS mode);

diff --git a/src/monster1.c b/src/monster1.c
index 13b84b7..b3553fb 100644 (file)
--- a/src/monster1.c
+++ b/src/monster1.c
@@ -3159,3 +3159,89 @@ concptr extract_note_dies(MONRACE_IDX r_idx)
 
        return _("は死んだ。", " dies.");
 }
+
+/*
+ * Monster health description
+ */
+concptr look_mon_desc(monster_type *m_ptr, BIT_FLAGS mode)
+{
+       monster_race *ap_r_ptr = &r_info[m_ptr->ap_r_idx];
+       bool living;
+       int perc;
+       concptr desc;
+       concptr attitude;
+       concptr clone;
+
+       /* Determine if the monster is "living" */
+       living = monster_living(m_ptr->ap_r_idx);
+
+       /* Calculate a health "percentage" */
+       perc = m_ptr->maxhp > 0 ? 100L * m_ptr->hp / m_ptr->maxhp : 0;
+
+       /* Healthy monsters */
+       if (m_ptr->hp >= m_ptr->maxhp)
+       {
+               desc = living ? _("無傷", "unhurt") : _("無ダメージ", "undamaged");
+       }
+
+       else if (perc >= 60)
+       {
+               desc = living ? _("軽傷", "somewhat wounded") : _("小ダメージ", "somewhat damaged");
+       }
+
+       else if (perc >= 25)
+       {
+               desc = living ? _("負傷", "wounded") : _("中ダメージ", "damaged");
+       }
+
+       else if (perc >= 10)
+       {
+               desc = living ? _("重傷", "badly wounded") : _("大ダメージ", "badly damaged");
+       }
+
+       else
+       {
+               desc = living ? _("半死半生", "almost dead") : _("倒れかけ", "almost destroyed");
+       }
+
+       /* Need attitude information? */
+       if (!(mode & 0x01))
+       {
+               /* Full information is not needed */
+               attitude = "";
+       }
+       else if (is_pet(m_ptr))
+       {
+               attitude = _(", ペット", ", pet");
+       }
+       else if (is_friendly(m_ptr))
+       {
+               attitude = _(", 友好的", ", friendly");
+       }
+       else
+       {
+               attitude = _("", "");
+       }
+
+       /* Clone monster? */
+       if (m_ptr->smart & SM_CLONED)
+       {
+               clone = ", clone";
+       }
+       else
+       {
+               clone = "";
+       }
+
+       /* Display monster's level --- idea borrowed from ToME */
+       if (ap_r_ptr->r_tkills && !(m_ptr->mflag2 & MFLAG2_KAGE))
+       {
+               return format(_("レベル%d, %s%s%s", "Level %d, %s%s%s"), ap_r_ptr->level, desc, attitude, clone);
+       }
+       else
+       {
+               return format(_("レベル???, %s%s%s", "Level ???, %s%s%s"), desc, attitude, clone);
+       }
+
+}
+

diff --git a/src/xtra2.c b/src/xtra2.c
index bb344df..987d463 100644 (file)
--- a/src/xtra2.c
+++ b/src/xtra2.c
@@ -180,91 +180,6 @@ void verify_panel(void)
 }
 
 
-/*
- * Monster health description
- */
-concptr look_mon_desc(monster_type *m_ptr, BIT_FLAGS mode)
-{
-       monster_race *ap_r_ptr = &r_info[m_ptr->ap_r_idx];
-       bool living;
-       int perc;
-       concptr desc;
-       concptr attitude;
-       concptr clone;
-
-       /* Determine if the monster is "living" */
-       living = monster_living(m_ptr->ap_r_idx);
-
-       /* Calculate a health "percentage" */
-       perc = m_ptr->maxhp > 0 ? 100L * m_ptr->hp / m_ptr->maxhp : 0;
-
-       /* Healthy monsters */
-       if (m_ptr->hp >= m_ptr->maxhp)
-       {
-               desc = living ? _("無傷", "unhurt") : _("無ダメージ", "undamaged");
-       }
-
-       else if (perc >= 60)
-       {
-               desc = living ? _("軽傷", "somewhat wounded") : _("小ダメージ", "somewhat damaged");
-       }
-
-       else if (perc >= 25)
-       {
-               desc = living ? _("負傷", "wounded") : _("中ダメージ", "damaged");
-       }
-
-       else if (perc >= 10)
-       {
-               desc = living ? _("重傷", "badly wounded") : _("大ダメージ", "badly damaged");
-       }
-
-       else 
-       {
-               desc = living ? _("半死半生", "almost dead") : _("倒れかけ", "almost destroyed");
-       }
-
-       /* Need attitude information? */
-       if (!(mode & 0x01))
-       {
-               /* Full information is not needed */
-               attitude = "";
-       }
-       else if (is_pet(m_ptr))
-       {
-               attitude = _(", ペット", ", pet");
-       }
-       else if (is_friendly(m_ptr))
-       {
-               attitude = _(", 友好的", ", friendly");
-       }
-       else
-       {
-               attitude = _("", "");
-       }
-
-       /* Clone monster? */
-       if (m_ptr->smart & SM_CLONED)
-       {
-               clone = ", clone";
-       }
-       else
-       {
-               clone = "";
-       }
-
-       /* Display monster's level --- idea borrowed from ToME */
-       if (ap_r_ptr->r_tkills && !(m_ptr->mflag2 & MFLAG2_KAGE))
-       {
-               return format(_("レベル%d, %s%s%s", "Level %d, %s%s%s"), ap_r_ptr->level, desc, attitude, clone);
-       }
-       else 
-       {
-               return format(_("レベル???, %s%s%s", "Level ???, %s%s%s"), desc, attitude, clone);
-       }
-
-}
-
 
 
 /*** Targeting Code ***/