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

19
src/dig.c
View File

@@ -486,16 +486,15 @@ boolean fill_if_any; /* force filling if it exists at all */
for (x1 = lo_x; x1 <= hi_x; x1++)
for (y1 = lo_y; y1 <= hi_y; y1++)
if (levl[x1][y1].typ == POOL)
pool_cnt++;
else if (levl[x1][y1].typ == MOAT ||
(levl[x1][y1].typ == DRAWBRIDGE_UP &&
(levl[x1][y1].drawbridgemask & DB_UNDER) == DB_MOAT))
moat_cnt++;
else if (levl[x1][y1].typ == LAVAPOOL ||
(levl[x1][y1].typ == DRAWBRIDGE_UP &&
(levl[x1][y1].drawbridgemask & DB_UNDER) == DB_LAVA))
lava_cnt++;
if (is_moat(x1, y1))
moat_cnt++;
else if (is_pool(x1, y1))
/* This must come after is_moat since moats are pools
* but not vice-versa. */
pool_cnt++;
else if (is_lava(x1, y1))
lava_cnt++;
if (!fill_if_any) pool_cnt /= 3; /* not as much liquid as the others */
if ((lava_cnt > moat_cnt + pool_cnt && rn2(lava_cnt + 1)) ||