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

Fix checking monster moving into a trap return value

Browse Source 
When I added a new trap return value, this was one place that
should've checked it.

This was really annoying to debug - it manifested as a temp level
file loading error, because a monster moved on to a level teleport
trap, which zeroes out (mx, my), then later in the monster movement,
a web spinner created a web at (0,0), and then hero leaving the level,
the traps were saved into the level file ... and when loaded, the code
thought a trap with x == 0 meant there were no more traps.
This commit is contained in:
Pasi Kallinen
2022-03-04 16:42:11 +02:00
parent 013bb8a112
commit 2cdd8f8dcb
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/monmove.c
View File

@@ -1441,6 +1441,8 @@ m_move(register struct monst* mtmp, register int after)
didseeit = canseeit; didseeit = canseeit;
if (mmoved == MMOVE_MOVED) { if (mmoved == MMOVE_MOVED) {
int trapret;
/* normal monster move will already have <nix,niy>, /* normal monster move will already have <nix,niy>,
but pet dog_move() with 'goto postmov' won't */ but pet dog_move() with 'goto postmov' won't */
nix = mtmp->mx, niy = mtmp->my; nix = mtmp->mx, niy = mtmp->my;
@@ -1475,7 +1477,8 @@ m_move(register struct monst* mtmp, register int after)
} }
newsym(omx, omy); /* update the old position */ newsym(omx, omy); /* update the old position */
if (mintrap(mtmp, NO_TRAP_FLAGS) == Trap_Killed_Mon) { trapret = mintrap(mtmp, NO_TRAP_FLAGS);
if (trapret == Trap_Killed_Mon || trapret == Trap_Moved_Mon) {
if (mtmp->mx) if (mtmp->mx)
newsym(mtmp->mx, mtmp->my); newsym(mtmp->mx, mtmp->my);
return 2; /* it died */ return 2; /* it died */