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

Fix drawbridge checking outside map

Browse Source
This commit is contained in:
Pasi Kallinen
2024-04-26 07:59:42 +03:00
parent ec99383b81
commit 26c8cbc931
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/dbridge.c
+8 -6
View File
@@ -131,28 +131,30 @@ db_under_typ(int mask)
* We want to know whether a wall (or a door) is the portcullis (passageway) * We want to know whether a wall (or a door) is the portcullis (passageway)
* of an eventual drawbridge. * of an eventual drawbridge.
* *
* Return value: the direction of the drawbridge. * Return value: the direction of the drawbridge, or -1 if not valid
*/ */
int int
is_drawbridge_wall(coordxy x, coordxy y) is_drawbridge_wall(coordxy x, coordxy y)
{ {
struct rm *lev; struct rm *lev;
if (!isok(x, y))
return -1;
lev = &levl[x][y]; lev = &levl[x][y];
if (lev->typ != DOOR && lev->typ != DBWALL) if (lev->typ != DOOR && lev->typ != DBWALL)
return -1; return -1;
if (IS_DRAWBRIDGE(levl[x + 1][y].typ) if (isok(x + 1, y) && IS_DRAWBRIDGE(levl[x + 1][y].typ)
&& (levl[x + 1][y].drawbridgemask & DB_DIR) == DB_WEST) && (levl[x + 1][y].drawbridgemask & DB_DIR) == DB_WEST)
return DB_WEST; return DB_WEST;
if (IS_DRAWBRIDGE(levl[x - 1][y].typ) if (isok(x - 1, y) && IS_DRAWBRIDGE(levl[x - 1][y].typ)
&& (levl[x - 1][y].drawbridgemask & DB_DIR) == DB_EAST) && (levl[x - 1][y].drawbridgemask & DB_DIR) == DB_EAST)
return DB_EAST; return DB_EAST;
if (IS_DRAWBRIDGE(levl[x][y - 1].typ) if (isok(x, y - 1) && IS_DRAWBRIDGE(levl[x][y - 1].typ)
&& (levl[x][y - 1].drawbridgemask & DB_DIR) == DB_SOUTH) && (levl[x][y - 1].drawbridgemask & DB_DIR) == DB_SOUTH)
return DB_SOUTH; return DB_SOUTH;
if (IS_DRAWBRIDGE(levl[x][y + 1].typ) if (isok(x, y + 1) && IS_DRAWBRIDGE(levl[x][y + 1].typ)
&& (levl[x][y + 1].drawbridgemask & DB_DIR) == DB_NORTH) && (levl[x][y + 1].drawbridgemask & DB_DIR) == DB_NORTH)
return DB_NORTH; return DB_NORTH;