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

Map column 0 is not a valid location

Browse Source
This commit is contained in:
Pasi Kallinen
2018-11-21 19:17:08 +02:00
parent 2beb36fc61
commit 030efe84fa
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/dog.c
View File

@@ -484,7 +484,7 @@ fail_mon_placement:
&& !LEVEL_SPECIFIC_NOCORPSE(mtmp->data)) && !LEVEL_SPECIFIC_NOCORPSE(mtmp->data))
(void) mkcorpstat(CORPSE, mtmp, mtmp->data, (void) mkcorpstat(CORPSE, mtmp, mtmp->data,
xlocale, ylocale, CORPSTAT_NONE); xlocale, ylocale, CORPSTAT_NONE);
mtmp->mx = mtmp->my = -1; /* for mongone, mon is not anywhere */ mtmp->mx = mtmp->my = 0; /* for mongone, mon is not anywhere */
mongone(mtmp); mongone(mtmp);
} }
} }

2
src/mail.c
View File

@@ -423,7 +423,7 @@ struct mail_info *info;
/* zip back to starting location */ /* zip back to starting location */
go_back: go_back:
if (!md_rush(md, start.x, start.y)) if (!md_rush(md, start.x, start.y))
md->mx = md->my = -1; /* for mongone, md is not on map */ md->mx = md->my = 0; /* for mongone, md is not on map */
mongone(md); mongone(md);
/* deliver some classes of messages even if no daemon ever shows up */ /* deliver some classes of messages even if no daemon ever shows up */
give_up: give_up:

4
src/mon.c
View File

@@ -105,7 +105,7 @@ mon_sanity_check()
} }
} }
for (x = 0; x < COLNO; x++) for (x = 1; x < COLNO; x++)
for (y = 0; y < ROWNO; y++) for (y = 0; y < ROWNO; y++)
if ((mtmp = level.monsters[x][y]) != 0) { if ((mtmp = level.monsters[x][y]) != 0) {
for (m = fmon; m; m = m->nmon) for (m = fmon; m; m = m->nmon)
@@ -1747,7 +1747,7 @@ m_detach(mtmp, mptr)
struct monst *mtmp; struct monst *mtmp;
struct permonst *mptr; /* reflects mtmp->data _prior_ to mtmp's death */ struct permonst *mptr; /* reflects mtmp->data _prior_ to mtmp's death */
{ {
boolean onmap = (mtmp->mx > -1); boolean onmap = (mtmp->mx > 0);
if (mtmp == context.polearm.hitmon) if (mtmp == context.polearm.hitmon)
context.polearm.hitmon = 0; context.polearm.hitmon = 0;