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

Factor out a new is_moat function.

Browse Source 
The fact that Juiblex's swamp is MOAT but not moat is weird and should
probably be looked at at some point.
This commit is contained in:
Sean Hunt
2015-02-23 14:59:24 -05:00
parent 6fd30ab1ce
commit 5ffd5a3000
4 changed files with 34 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/dbridge.c
View File

@@ -42,9 +42,11 @@ int x,y;
if (!isok(x,y)) return FALSE;
ltyp = levl[x][y].typ;
if (ltyp == POOL || ltyp == MOAT || ltyp == WATER) return TRUE;
if (ltyp == DRAWBRIDGE_UP &&
(levl[x][y].drawbridgemask & DB_UNDER) == DB_MOAT) return TRUE;
/* The ltyp == MOAT is not redundant with is_moat, because the
* Juiblex level does not have moats, although it has MOATs. There
* is probably a better way to express this. */
if (ltyp == POOL || ltyp == MOAT || ltyp == WATER || is_moat(x, y))
return TRUE;
return FALSE;
}
@@ -86,6 +88,21 @@ int x,y;
return FALSE;
}
boolean
is_moat(x,y)
int x, y;
{
schar ltyp;
if (!isok(x, y)) return FALSE;
ltyp = levl[x][y].typ;
if (!Is_juiblex_level(&u.uz) &&
(ltyp == MOAT || (ltyp == DRAWBRIDGE_UP &&
(levl[x][y].drawbridgemask & DB_UNDER) == DB_MOAT)))
return TRUE;
return FALSE;
}
/*
* We want to know whether a wall (or a door) is the portcullis (passageway)
* of an eventual drawbridge.