OSDN Git Service
(root)
/
hengband
/
hengband.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
[Refactor] #37353 ALLOW_FEARのプリプロが有効であることを前提とし、プリプロ自体は削除 / Removed ALLOW_FEAR but...
[hengband/hengband.git]
/
src
/
monster-status.c
diff --git
a/src/monster-status.c
b/src/monster-status.c
index
13e2977
..
94907ae
100644
(file)
--- a/
src/monster-status.c
+++ b/
src/monster-status.c
@@
-1411,8
+1411,6
@@
bool mon_take_hit(player_type *target_ptr, MONSTER_IDX m_idx, HIT_POINT dam, boo
return TRUE;
}
-#ifdef ALLOW_FEAR
-
/* Mega-Hack -- Pain cancels fear */
if (MON_MONFEAR(m_ptr) && (dam > 0))
{
@@
-1446,12
+1444,11
@@
bool mon_take_hit(player_type *target_ptr, MONSTER_IDX m_idx, HIT_POINT dam, boo
}
}
-#endif
-
/* Not dead yet */
return FALSE;
}
+
bool monster_is_valid(monster_type *m_ptr)
{
return (m_ptr->r_idx != 0);