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

Fix skipping attacks if hero moved away

Browse Source 
Recent change by me caused a bug where a monster was trying
to attack after hero was moved away by the previous attacks.
This commit is contained in:
Pasi Kallinen
2022-12-07 21:51:50 +02:00
parent d18ce24320
commit 85137bb76a
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mhitu.c
+3 -2
View File
@@ -418,7 +418,7 @@ mattacku(register struct monst *mtmp)
* excessively verbose miss feedback when monster can do multiple * excessively verbose miss feedback when monster can do multiple
* attacks and would miss the same wrong spot each time.) * attacks and would miss the same wrong spot each time.)
*/ */
boolean ranged, range2, foundyou, youseeit, boolean ranged, range2, foundyou, firstfoundyou, youseeit,
skipnonmagc = FALSE; skipnonmagc = FALSE;
calc_mattacku_vars(mtmp, &ranged, &range2, &foundyou, &youseeit); calc_mattacku_vars(mtmp, &ranged, &range2, &foundyou, &youseeit);
@@ -663,12 +663,13 @@ mattacku(register struct monst *mtmp)
} }
gs.skipdrin = FALSE; /* [see mattackm(mhitm.c)] */ gs.skipdrin = FALSE; /* [see mattackm(mhitm.c)] */
firstfoundyou = foundyou;
for (i = 0; i < NATTK; i++) { for (i = 0; i < NATTK; i++) {
/* recalc in case attack moved hero */ /* recalc in case attack moved hero */
calc_mattacku_vars(mtmp, &ranged, &range2, &foundyou, &youseeit); calc_mattacku_vars(mtmp, &ranged, &range2, &foundyou, &youseeit);
sum[i] = MM_MISS; sum[i] = MM_MISS;
if (i > 0 && foundyou /* previous attack might have moved hero */ if (i > 0 && firstfoundyou /* previous attack might have moved hero */
&& (mtmp->mux != u.ux || mtmp->muy != u.uy)) && (mtmp->mux != u.ux || mtmp->muy != u.uy))
continue; /* fill in sum[] with 'miss' but skip other actions */ continue; /* fill in sum[] with 'miss' but skip other actions */
mon_currwep = (struct obj *) 0; mon_currwep = (struct obj *) 0;