• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

変愚蛮怒のメインリポジトリです


Commit MetaInfo

Revision261c9345777b0e1a5b19ca74dccea340929ee520 (tree)
Time2018-12-03 23:31:06
AuthorDeskull <deskull@user...>
CommiterDeskull

Log Message

[Refactor] #37353 mon_take_hit() のコメントアウト済落馬処理を削除。 / Delete comment outed process in mon_take_hit().

Change Summary

Incremental Difference

--- a/src/xtra2.c
+++ b/src/xtra2.c
@@ -1868,7 +1868,7 @@ bool mon_take_hit(MONSTER_IDX m_idx, HIT_POINT dam, bool *fear, cptr note)
18681868 if ((p_ptr->pseikaku == SEIKAKU_COMBAT) || (inventory[INVEN_BOW].name1 == ART_CRIMSON))
18691869 msg_format("せっかくだから%sを倒した。", m_name);
18701870 else
1871-msg_format("%sを倒した。", m_name);
1871+ msg_format("%sを倒した。", m_name);
18721872 #else
18731873 msg_format("You have destroyed %s.", m_name);
18741874 #endif
@@ -1882,7 +1882,7 @@ msg_format("%sを倒した。", m_name);
18821882 if ((p_ptr->pseikaku == SEIKAKU_COMBAT) || (inventory[INVEN_BOW].name1 == ART_CRIMSON))
18831883 msg_format("せっかくだから%sを葬り去った。", m_name);
18841884 else
1885-msg_format("%sを葬り去った。", m_name);
1885+ msg_format("%sを葬り去った。", m_name);
18861886 #else
18871887 msg_format("You have slain %s.", m_name);
18881888 #endif
@@ -1904,18 +1904,13 @@ msg_format("%sを葬り去った。", m_name);
19041904 monster_death(m_idx, TRUE);
19051905
19061906 /* Mega hack : replace IKETA to BIKETAL */
1907- if ((m_ptr->r_idx == MON_IKETA) &&
1908- !(p_ptr->inside_arena || p_ptr->inside_battle))
1907+ if ((m_ptr->r_idx == MON_IKETA) && !(p_ptr->inside_arena || p_ptr->inside_battle))
19091908 {
1910- int dummy_y = m_ptr->fy;
1911- int dummy_x = m_ptr->fx;
1909+ POSITION dummy_y = m_ptr->fy;
1910+ POSITION dummy_x = m_ptr->fx;
19121911 BIT_FLAGS mode = 0L;
1913-
19141912 if (is_pet(m_ptr)) mode |= PM_FORCE_PET;
1915-
1916-
19171913 delete_monster_idx(m_idx);
1918-
19191914 if (summon_named_creature(0, dummy_y, dummy_x, MON_BIKETAL, mode))
19201915 {
19211916 msg_print(_("「ハァッハッハッハ!!私がバイケタルだ!!」", "Uwa-hahaha! *I* am Biketal!"));
@@ -1923,7 +1918,6 @@ msg_format("%sを葬り去った。", m_name);
19231918 }
19241919 else
19251920 {
1926-
19271921 delete_monster_idx(m_idx);
19281922 }
19291923
@@ -1960,8 +1954,7 @@ msg_format("%sを葬り去った。", m_name);
19601954 * Run (sometimes) if at 10% or less of max hit points,
19611955 * or (usually) when hit for half its current hit points
19621956 */
1963- if ((randint1(10) >= percentage) ||
1964- ((dam >= m_ptr->hp) && (randint0(100) < 80)))
1957+ if ((randint1(10) >= percentage) || ((dam >= m_ptr->hp) && (randint0(100) < 80)))
19651958 {
19661959 /* Hack -- note fear */
19671960 (*fear) = TRUE;
@@ -1975,22 +1968,6 @@ msg_format("%sを葬り去った。", m_name);
19751968
19761969 #endif
19771970
1978-#if 0
1979- if (p_ptr->riding && (p_ptr->riding == m_idx) && (dam > 0))
1980- {
1981- char m_name[80];
1982-
1983- /* Extract monster name */
1984- monster_desc(m_name, m_ptr, 0);
1985-
1986- if (m_ptr->hp > m_ptr->maxhp/3) dam = (dam + 1) / 2;
1987- if (rakuba((dam > 200) ? 200 : dam, FALSE))
1988- {
1989- msg_format(_("%^sに振り落とされた!", "%^s has thrown you off!"), m_name);
1990- }
1991- }
1992-#endif
1993-
19941971 /* Not dead yet */
19951972 return (FALSE);
19961973 }
Show on old repository browser