Fix addressing deleted trap when helping monster out of a pit

Move reward_untrap before fill_pit, as the trap may get deleted.
This commit is contained in:
Pasi Kallinen
2019-10-13 19:57:05 +03:00
parent 9e9ee59ca7
commit 1f7095e226
2 changed files with 2 additions and 1 deletions

View File

@@ -182,6 +182,7 @@ fix firing attached iron ball when swallowed causing a sanity error
fix vault guard impossible when he could not relocate in certain situation
fix temple priests or shopkeepers moving over other monsters
fix hero still hiding under a statue shattered by a land mine
fix helping a monster out of a pit addressing a deleted trap
Fixes to Post-3.6.2 Problems that Were Exposed Via git Repository

View File

@@ -4346,8 +4346,8 @@ struct trap *ttmp;
You("pull %s out of the pit.", mon_nam(mtmp));
mtmp->mtrapped = 0;
fill_pit(mtmp->mx, mtmp->my);
reward_untrap(ttmp, mtmp);
fill_pit(mtmp->mx, mtmp->my);
return 1;
}