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

Prevent out-of-bounds coords when closing a door

Browse Source
This commit is contained in:
Pasi Kallinen
2015-04-15 19:43:53 +03:00
parent e77ea2ae61
commit 35e0027328
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lock.c
+5 -1
View File
@@ -692,6 +692,8 @@ doclose() /* try to close a door */
return(1); return(1);
} }
if (!isok(x,y)) goto nodoor;
if ((mtmp = m_at(x,y)) && if ((mtmp = m_at(x,y)) &&
mtmp->m_ap_type == M_AP_FURNITURE && mtmp->m_ap_type == M_AP_FURNITURE &&
(mtmp->mappearance == S_hcdoor || (mtmp->mappearance == S_hcdoor ||
@@ -723,8 +725,10 @@ doclose() /* try to close a door */
pline_The("drawbridge is already closed."); pline_The("drawbridge is already closed.");
else if (portcullis || door->typ == DRAWBRIDGE_DOWN) else if (portcullis || door->typ == DRAWBRIDGE_DOWN)
There("is no obvious way to close the drawbridge."); There("is no obvious way to close the drawbridge.");
else else {
nodoor:
You("%s no door there.", Blind ? "feel" : "see"); You("%s no door there.", Blind ? "feel" : "see");
}
return res; return res;
} }