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

10
src/cmd.c
View File

@@ -2257,7 +2257,7 @@ int final;
: surface(u.ux, u.uy)); /* catchall; shouldn't happen */
you_are(buf, from_what(WWALKING));
}
if (Upolyd && (u.uundetected || g.youmonst.m_ap_type != M_AP_NOTHING))
if (Upolyd && (u.uundetected || U_AP_TYPE != M_AP_NOTHING))
youhiding(TRUE, final);
/* internal troubles, mostly in the order that prayer ranks them */
@@ -3079,16 +3079,16 @@ int msgflag; /* for variant message phrasing */
char *bp, buf[BUFSZ];
Strcpy(buf, "hiding");
if (g.youmonst.m_ap_type != M_AP_NOTHING) {
if (U_AP_TYPE != M_AP_NOTHING) {
/* mimic; hero is only able to mimic a strange object or gold
or hallucinatory alternative to gold, so we skip the details
for the hypothetical furniture and monster cases */
bp = eos(strcpy(buf, "mimicking"));
if (g.youmonst.m_ap_type == M_AP_OBJECT) {
if (U_AP_TYPE == M_AP_OBJECT) {
Sprintf(bp, " %s", an(simple_typename(g.youmonst.mappearance)));
} else if (g.youmonst.m_ap_type == M_AP_FURNITURE) {
} else if (U_AP_TYPE == M_AP_FURNITURE) {
Strcpy(bp, " something");
} else if (g.youmonst.m_ap_type == M_AP_MONSTER) {
} else if (U_AP_TYPE == M_AP_MONSTER) {
Strcpy(bp, " someone");
} else {
; /* something unexpected; leave 'buf' as-is */