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

enhance timer sanity checks a bit

Browse Source 
Four kinds of timers are defined but only two have ever been used.
Have sanity checking complain if the other two occur or if 'kind'
doesn't match any of the four.

Also, replacing a perfectly normal use of isok() with an inline test
just to pacify static analysis feels like a slippery slope, so handle
that a little differently.

I reordered the shrink_glob timer to put all object timers together.
Unfortunately that warrants incrementing EDITLEVEL which invalidates
existing save files.
This commit is contained in:
PatR
2023-12-22 17:48:51 -08:00
parent 18efc74db2
commit 7a533a911c
3 changed files with 74 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/timeout.h
View File

@@ -1,4 +1,4 @@
/* NetHack 3.7 timeout.h $NHDT-Date: 1596498564 2020/08/03 23:49:24 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.13 $ */
/* NetHack 3.7 timeout.h $NHDT-Date: 1703294874 2023/12/23 01:27:54 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.22 $ */
/* Copyright 1994, Dean Luick */
/* NetHack may be freely redistributed. See license for details. */
@@ -22,8 +22,14 @@ enum timer_type {
#define RANGE_GLOBAL 1 /* save/restore timers following global play */
/*
* Timeout functions. Add a define here, then put it in the table
* Timeout functions. Add an enum here, then put it in the table
* in timeout.c. "One more level of indirection will fix everything."
*
* Note: if any are inserted, removed, or reordered then EDITLEVEL
* needs to be incremented because timeout indices get written into save
* and bones files if any timers are present while saving. (Adding new
* ones at the end isn't restricted this way since new indices won't be
* present in old data.)
*/
enum timeout_types {
ROT_ORGANIC = 0, /* for buried organics */
@@ -33,8 +39,8 @@ enum timeout_types {
BURN_OBJECT,
HATCH_EGG,
FIG_TRANSFORM,
MELT_ICE_AWAY,
SHRINK_GLOB,
MELT_ICE_AWAY,
NUM_TIME_FUNCS
};