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

minetown guards outside the town proper

Browse Source 
Pat forwarded a message from the newsgroup in March that the town guards
enforce rules even outside the town proper.  Fix: On room-based town levels,
check if the location is in a room containing subrooms (roomno will often
have a subroom id instead).  On the other levels (e.g. minetn-5), there are
no subrooms, so the whole level is fair game.  Currently, this is valid.
If fancier towns are added in the future, more flags or use of regions may
be required to tell where the town border actually is.  These checks are done
in a new in_town function.
This commit is contained in:
cohrs
2002-07-15 04:17:13 +00:00
parent b440613866
commit a21ddbb2bf
7 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/fountain.c
View File

@@ -152,9 +152,7 @@ boolean isyou;
{
if (IS_FOUNTAIN(levl[x][y].typ) &&
(!rn2(3) || FOUNTAIN_IS_WARNED(x,y))) {
s_level *slev = Is_special(&u.uz);
if(isyou && slev && slev->flags.town &&
!FOUNTAIN_IS_WARNED(x,y)) {
if(isyou && in_town(x, y) && !FOUNTAIN_IS_WARNED(x,y)) {
struct monst *mtmp;
SET_FOUNTAIN_WARNED(x,y);
/* Warn about future fountain use. */
@@ -188,7 +186,7 @@ boolean isyou;
/* or felt if the hero is blind. */
newsym(x, y);
level.flags.nfountains--;
if(isyou && slev && slev->flags.town)
if(isyou && in_town(x, y))
(void) angry_guards(FALSE);
}
}
@@ -362,7 +360,6 @@ register struct obj *obj;
&& u.ulevel >= 5 && !rn2(6)
&& !obj->oartifact
&& !exist_artifact(LONG_SWORD, artiname(ART_EXCALIBUR))) {
s_level *slev = Is_special(&u.uz);
if (u.ualign.type != A_LAWFUL) {
/* Ha! Trying to cheat her. */
@@ -389,7 +386,7 @@ register struct obj *obj;
levl[u.ux][u.uy].looted = 0;
if(Invisible) newsym(u.ux, u.uy);
level.flags.nfountains--;
if(slev && slev->flags.town)
if(in_town(u.ux, u.uy))
(void) angry_guards(FALSE);
return;
} else (void) get_wet(obj);