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

lua timer fix

Browse Source 
Commit 7a533a911c about three weeks
ago reordered a couple of timers.  The list of timers in nhlua.c was
overlooked at the time.

The theme room "Ice room" was affected.  I'm surprised that sanity
checking while running the fuzzer didn't notice and complain.
This commit is contained in:
PatR
2024-01-12 11:31:48 -08:00
parent 6274ad3259
commit 4609f23332
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/timeout.h
View File

@@ -1,4 +1,4 @@
/* NetHack 3.7 timeout.h $NHDT-Date: 1703294874 2023/12/23 01:27:54 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.22 $ */
/* NetHack 3.7 timeout.h $NHDT-Date: 1705087443 2024/01/12 19:24:03 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.23 $ */
/* Copyright 1994, Dean Luick */
/* NetHack may be freely redistributed. See license for details. */
@@ -24,6 +24,8 @@ enum timer_type {
/*
* Timeout functions. Add an enum here, then put it in the table
* in timeout.c. "One more level of indirection will fix everything."
* Also add it to timerstr[] in nhl_get_timertype(nhlua.c); the entries
* there match these but are spelled diffently.
*
* Note: if any are inserted, removed, or reordered then EDITLEVEL
* needs to be incremented because timeout indices get written into save

8
src/nhlua.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.7 nhlua.c $NHDT-Date: 1704497031 2024/01/05 23:23:51 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.126 $ */
/* NetHack 3.7 nhlua.c $NHDT-Date: 1705087450 2024/01/12 19:24:10 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.129 $ */
/* Copyright (c) 2018 by Pasi Kallinen */
/* NetHack may be freely redistributed. See license for details. */
@@ -255,10 +255,12 @@ get_table_mapchr_opt(lua_State *L, const char *name, schar defval)
short
nhl_get_timertype(lua_State *L, int idx)
{
/* these are in the same order as enum timeout_types in timeout.h and
ttable timeout_funcs[] in timeout.c, although not spelled the same */
static const char *const timerstr[NUM_TIME_FUNCS + 1] = {
"rot-organic", "rot-corpse", "revive-mon", "zombify-mon",
"burn-obj", "hatch-egg", "fig-transform", "melt-ice",
"shrink-glob", NULL
"burn-obj", "hatch-egg", "fig-transform", "shrink-glob",
"melt-ice", NULL
};
short ret = luaL_checkoption(L, idx, NULL, timerstr);