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

Merge branch 'pr617' into NetHack-3.7

Browse Source
This commit is contained in:
nhmall
2021-10-22 15:24:37 -04:00
parent b44b5e35a8 df0ed882a8
commit 56f79dd207
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/fixes37.0
View File

@@ -1315,6 +1315,7 @@ MAX_RADIUS defines the outer bound of the radius table, so leave it at 15
variable attknum was declared without initialization, and was used in variable attknum was declared without initialization, and was used in
find_roll_to_hit() (pr #615 by argrath) find_roll_to_hit() (pr #615 by argrath)
check for NULL lua_State before calling lua_close() (pr #616 by argrath) check for NULL lua_State before calling lua_close() (pr #616 by argrath)
use %lu, not %d, in format string in timer_sanity_check() (pr #617 by argrath)
Code Cleanup and Reorganization Code Cleanup and Reorganization

4
src/timeout.c
View File

@@ -1874,10 +1874,10 @@ timer_sanity_check(void)
y = (xchar) (where & 0xFFFF); y = (xchar) (where & 0xFFFF);
if (!isok(x, y)) { if (!isok(x, y)) {
impossible("timer sanity: spot timer %d at <%d,%d>", impossible("timer sanity: spot timer %lu at <%d,%d>",
curr->tid, x, y); curr->tid, x, y);
} else if (curr->func_index == MELT_ICE_AWAY && !is_ice(x, y)) { } else if (curr->func_index == MELT_ICE_AWAY && !is_ice(x, y)) {
impossible("timer sanity: melt timer %d on non-ice %d <%d,%d>", impossible("timer sanity: melt timer %lu on non-ice %d <%d,%d>",
curr->tid, levl[x][y].typ, x, y); curr->tid, levl[x][y].typ, x, y);
} }
} }