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

livelog level entry events

Browse Source 
Fix up the level descriptions used when logging an "entered new level"
event.  Most of the change is for adding an extra argument to calls
to describe_level().  The curses portion is in a big chunk of old code
suppressed by #if 0.

I didn't notice that the level entry events are classified as LL_DEBUG
until all the work was done.  This promotes the entry events for the
four Plane of <Element> levels from debug events to major ones instead.
It doesn't do that for the Astral Plane because the entered-the-Astral-
Plane achievement already produces a major event for that.  Most other
key level entry events are in a similar situation--or will become that
way once another set of achievements eventually gets added--so there
aren't any other event classification promotions.
This commit is contained in:
PatR
2022-03-01 13:53:57 -08:00
parent 2f273eb70b
commit 2bef05bb77
10 changed files with 71 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/mon.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.7 mon.c $NHDT-Date: 1629817677 2021/08/24 15:07:57 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.384 $ */
/* NetHack 3.7 mon.c $NHDT-Date: 1646171625 2022/03/01 21:53:45 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.410 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Derek S. Ray, 2015. */
/* NetHack may be freely redistributed. See license for details. */
@@ -2078,7 +2078,7 @@ mm_displacement(
/* Is the square close enough for the monster to move or attack into? */
boolean
monnear(struct monst* mon, int x, int y)
monnear(struct monst *mon, int x, int y)
{
int distance = dist2(mon->mx, mon->my, x, y);
@@ -2108,7 +2108,7 @@ dmonsfree(void)
}
if (count != iflags.purge_monsters) {
describe_level(buf);
describe_level(buf, 2);
impossible("dmonsfree: %d removed doesn't match %d pending on %s",
count, iflags.purge_monsters, buf);
}
@@ -2117,7 +2117,7 @@ dmonsfree(void)
/* called when monster is moved to larger structure */
void
replmon(struct monst* mtmp, struct monst* mtmp2)
replmon(struct monst *mtmp, struct monst *mtmp2)
{
struct obj *otmp;
@@ -2287,13 +2287,13 @@ dealloc_mextra(struct monst* m)
}
void
dealloc_monst(struct monst* mon)
dealloc_monst(struct monst *mon)
{
char buf[QBUFSZ];
buf[0] = '\0';
if (mon->nmon) {
describe_level(buf);
describe_level(buf, 2);
panic("dealloc_monst with nmon on %s", buf);
}
if (mon->mextra)