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

Merge branch 'NetHack-3.6.2'

Browse Source
This commit is contained in:
nhmall
2019-04-22 14:36:58 -04:00
parent e4ac043747 b2459229da
commit d15496ba31
30 changed files with 126 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/polyself.c
View File

@@ -158,7 +158,7 @@ polyman(fmt, arg)
const char *fmt, *arg;
{
boolean sticky = (sticks(g.youmonst.data) && u.ustuck && !u.uswallow),
was_mimicking = (g.youmonst.m_ap_type == M_AP_OBJECT);
was_mimicking = (U_AP_TYPE == M_AP_OBJECT);
boolean was_blind = !!Blind;
if (Upolyd) {
@@ -621,7 +621,7 @@ int mntmp;
}
/* if stuck mimicking gold, stop immediately */
if (g.multi < 0 && g.youmonst.m_ap_type == M_AP_OBJECT
if (multi < 0 && U_AP_TYPE == M_AP_OBJECT
&& g.youmonst.data->mlet != S_MIMIC)
unmul("");
/* if becoming a non-mimic, stop mimicking anything */
@@ -1319,8 +1319,8 @@ dogaze()
pline("%s seems not to notice your gaze.", Monnam(mtmp));
} else if (mtmp->minvis && !See_invisible) {
You_cant("see where to gaze at %s.", Monnam(mtmp));
} else if (mtmp->m_ap_type == M_AP_FURNITURE
|| mtmp->m_ap_type == M_AP_OBJECT) {
} else if (M_AP_TYPE(mtmp) == M_AP_FURNITURE
|| M_AP_TYPE(mtmp) == M_AP_OBJECT) {
looked--;
continue;
} else if (flags.safe_dog && mtmp->mtame && !Confusion) {
@@ -1428,7 +1428,7 @@ dohide()
: (humanoid(u.ustuck->data) ? "holding someone"
: "holding that creature"));
if (u.uundetected
|| (ismimic && g.youmonst.m_ap_type != M_AP_NOTHING)) {
|| (ismimic && U_AP_TYPE != M_AP_NOTHING)) {
u.uundetected = 0;
g.youmonst.m_ap_type = M_AP_NOTHING;
newsym(u.ux, u.uy);
@@ -1466,7 +1466,7 @@ dohide()
* else make youhiding() give smarter messages at such spots.
*/
if (u.uundetected || (ismimic && g.youmonst.m_ap_type != M_AP_NOTHING)) {
if (u.uundetected || (ismimic && U_AP_TYPE != M_AP_NOTHING)) {
youhiding(FALSE, 1); /* "you are already hiding" */
return 0;
}