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

Fix use of data from deleted vault teleport trap

Browse Source
This commit is contained in:
Pasi Kallinen
2015-11-15 18:55:09 +02:00
parent d813c6f0ee
commit 8a07e2cdc5
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/teleport.c
View File

@@ -490,12 +490,14 @@ int
dotele() dotele()
{ {
struct trap *trap; struct trap *trap;
boolean trap_once = FALSE;
trap = t_at(u.ux, u.uy); trap = t_at(u.ux, u.uy);
if (trap && (!trap->tseen || trap->ttyp != TELEP_TRAP)) if (trap && (!trap->tseen || trap->ttyp != TELEP_TRAP))
trap = 0; trap = 0;
if (trap) { if (trap) {
trap_once = trap->once; /* trap may get deleted, save this */
if (trap->once) { if (trap->once) {
pline("This is a vault teleport, usable once only."); pline("This is a vault teleport, usable once only.");
if (yn("Jump in?") == 'n') if (yn("Jump in?") == 'n')
@@ -569,7 +571,7 @@ dotele()
} }
if (next_to_u()) { if (next_to_u()) {
if (trap && trap->once) if (trap && trap_once)
vault_tele(); vault_tele();
else else
tele(); tele();