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

Merge branch 'master' into win32-x64-working

Browse Source 
Conflicts:
	include/extern.h
	src/do.c
	src/mon.c

 Changes to be committed:
	modified:   include/extern.h
	modified:   src/ball.c
	modified:   src/do.c
	modified:   src/eat.c
	modified:   src/hack.c
	modified:   src/invent.c
	modified:   src/lock.c
	modified:   src/mon.c
	modified:   src/pickup.c
	modified:   src/pline.c
	modified:   src/save.c
	modified:   src/sp_lev.c
	modified:   src/steed.c
	modified:   src/trap.c
	modified:   src/uhitm.c
This commit is contained in:
nhmall
2015-04-22 08:08:50 -04:00
parent 3238303dc8 ed164ad324
commit c78d09a7d4
15 changed files with 167 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/trap.c
View File

@@ -4107,14 +4107,7 @@ boolean force;
return(0);
}
if ((mtmp = m_at(x,y)) &&
mtmp->m_ap_type == M_AP_FURNITURE &&
(mtmp->mappearance == S_hcdoor ||
mtmp->mappearance == S_vcdoor) &&
!Protection_from_shape_changers) {
stumble_onto_mimic(mtmp);
return(1);
}
if (stumble_on_door_mimic(x,y)) return 1;
} /* deal_with_floor_trap */
/* doors can be manipulated even while levitating/unskilled riding */