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

Another round of instance globals changes.

Browse Source
This commit is contained in:
Bart House
2018-12-24 16:43:50 -08:00
parent e5e906dc3b
commit 572ee347b9
78 changed files with 946 additions and 975 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/pager.c
View File

@@ -422,8 +422,8 @@ char *buf, *monbuf;
Sprintf(buf, "interior of %s", a_monnam(u.ustuck));
pm = u.ustuck->data;
} else if (glyph_is_monster(glyph)) {
bhitpos.x = x;
bhitpos.y = y;
g.bhitpos.x = x;
g.bhitpos.y = y;
if ((mtmp = m_at(x, y)) != 0) {
look_at_monster(buf, monbuf, mtmp, x, y);
pm = mtmp->data;
@@ -1286,8 +1286,8 @@ boolean do_mons; /* True => monsters, False => objects */
if (glyph_is_monster(glyph)) {
struct monst *mtmp;
bhitpos.x = x; /* [is this actually necessary?] */
bhitpos.y = y;
g.bhitpos.x = x; /* [is this actually necessary?] */
g.bhitpos.y = y;
if (x == u.ux && y == u.uy && canspotself()) {
(void) self_lookat(lookbuf);
++count;
@@ -1477,7 +1477,7 @@ doidtrap()
}
}
for (trap = ftrap; trap; trap = trap->ntrap)
for (trap = g.ftrap; trap; trap = trap->ntrap)
if (trap->tx == x && trap->ty == y) {
if (!trap->tseen)
break;