nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Use macros for monster appearances

Browse Source
This commit is contained in:
Pasi Kallinen
2015-10-18 13:55:11 +03:00
parent 822b372644
commit 95983f6ae6
11 changed files with 20 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/mon.c
View File

@@ -2531,8 +2531,8 @@ void
seemimic(mtmp)
register struct monst *mtmp;
{
unsigned old_app = mtmp->mappearance;
uchar old_ap_type = mtmp->m_ap_type;
boolean is_blocker_appear = is_door_mappear(mtmp) ||
is_obj_mappear(mtmp, BOULDER);
if (has_mcorpsenm(mtmp))
freemcorpsenm(mtmp);
@@ -2543,9 +2543,7 @@ register struct monst *mtmp;
/*
* Discovered mimics don't block light.
*/
if (((old_ap_type == M_AP_FURNITURE
&& (old_app == S_hcdoor || old_app == S_vcdoor))
|| (old_ap_type == M_AP_OBJECT && old_app == BOULDER))
if (is_blocker_appear
&& !does_block(mtmp->mx, mtmp->my, &levl[mtmp->mx][mtmp->my]))
unblock_point(mtmp->mx, mtmp->my);