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

Fix article used for steed when stepping on trap

Browse Source 
This was caused by the trap code refactor I did a month ago.
This commit is contained in:
Pasi Kallinen
2021-01-23 11:25:53 +02:00
parent 2b525aab02
commit 0dd6960cb1
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/trap.c
+16 -7
View File
@@ -1497,6 +1497,11 @@ unsigned trflags;
int steed_article = ARTICLE_THE; int steed_article = ARTICLE_THE;
int oldumort; int oldumort;
/* suppress article in various steed messages when using its
name (which won't occur when hallucinating) */
if (u.usteed && has_mgivenname(u.usteed) && !Hallucination)
steed_article = ARTICLE_NONE;
/* KMH -- You can't escape the Sokoban level traps */ /* KMH -- You can't escape the Sokoban level traps */
if (!Sokoban && (Levitation || (Flying && !plunged))) if (!Sokoban && (Levitation || (Flying && !plunged)))
return 0; return 0;
@@ -1765,6 +1770,11 @@ unsigned trflags;
boolean viasitting = (trflags & VIASITTING) != 0; boolean viasitting = (trflags & VIASITTING) != 0;
int steed_article = ARTICLE_THE; int steed_article = ARTICLE_THE;
/* suppress article in various steed messages when using its
name (which won't occur when hallucinating) */
if (u.usteed && has_mgivenname(u.usteed) && !Hallucination)
steed_article = ARTICLE_NONE;
feeltrap(trap); feeltrap(trap);
if (mu_maybe_destroy_web(&g.youmonst, webmsgok, trap)) if (mu_maybe_destroy_web(&g.youmonst, webmsgok, trap))
return 0; return 0;
@@ -2061,6 +2071,11 @@ unsigned trflags;
int steed_article = ARTICLE_THE; int steed_article = ARTICLE_THE;
char verbbuf[BUFSZ]; char verbbuf[BUFSZ];
/* suppress article in various steed messages when using its
name (which won't occur when hallucinating) */
if (u.usteed && has_mgivenname(u.usteed) && !Hallucination)
steed_article = ARTICLE_NONE;
seetrap(trap); seetrap(trap);
if (viasitting) if (viasitting)
Strcpy(verbbuf, "trigger"); /* follows "You sit down." */ Strcpy(verbbuf, "trigger"); /* follows "You sit down." */
@@ -2392,7 +2407,6 @@ unsigned trflags;
plunged = (trflags & TOOKPLUNGE) != 0, plunged = (trflags & TOOKPLUNGE) != 0,
conj_pit = conjoined_pits(trap, t_at(u.ux0, u.uy0), TRUE), conj_pit = conjoined_pits(trap, t_at(u.ux0, u.uy0), TRUE),
adj_pit = adj_nonconjoined_pit(trap); adj_pit = adj_nonconjoined_pit(trap);
int steed_article = ARTICLE_THE;
nomul(0); nomul(0);
@@ -2428,13 +2442,8 @@ unsigned trflags;
} }
} }
if (u.usteed) { if (u.usteed)
u.usteed->mtrapseen |= (1 << (ttype - 1)); u.usteed->mtrapseen |= (1 << (ttype - 1));
/* suppress article in various steed messages when using its
name (which won't occur when hallucinating) */
if (has_mgivenname(u.usteed) && !Hallucination)
steed_article = ARTICLE_NONE;
}
/* /*
* Note: * Note: