Merge branch 'NetHack-3.6.2'
This commit is contained in:
@@ -229,8 +229,8 @@ register struct monst *mtmp;
|
||||
|| mtmp->data->mlet == S_LEPRECHAUN) || !rn2(50))
|
||||
&& (Aggravate_monster
|
||||
|| (mtmp->data->mlet == S_DOG || mtmp->data->mlet == S_HUMAN)
|
||||
|| (!rn2(7) && mtmp->m_ap_type != M_AP_FURNITURE
|
||||
&& mtmp->m_ap_type != M_AP_OBJECT))) {
|
||||
|| (!rn2(7) && M_AP_TYPE(mtmp) != M_AP_FURNITURE
|
||||
&& M_AP_TYPE(mtmp) != M_AP_OBJECT))) {
|
||||
mtmp->msleeping = 0;
|
||||
return 1;
|
||||
}
|
||||
@@ -329,8 +329,8 @@ boolean fleemsg;
|
||||
mtmp->mfleetim = (unsigned) min(fleetime, 127);
|
||||
}
|
||||
if (!mtmp->mflee && fleemsg && canseemon(mtmp)
|
||||
&& mtmp->m_ap_type != M_AP_FURNITURE
|
||||
&& mtmp->m_ap_type != M_AP_OBJECT) {
|
||||
&& M_AP_TYPE(mtmp) != M_AP_FURNITURE
|
||||
&& M_AP_TYPE(mtmp) != M_AP_OBJECT) {
|
||||
/* unfortunately we can't distinguish between temporary
|
||||
sleep and temporary paralysis, so both conditions
|
||||
receive the same alternate message */
|
||||
|
||||
Reference in New Issue
Block a user