From 07de17d747d5e4e0ad31e020e098fa6094a21764 Mon Sep 17 00:00:00 2001 From: PatR Date: Fri, 21 Jun 2024 12:57:31 -0700 Subject: [PATCH] obj->where == OBJ_DELETED The list of possible object locations used when formatting obj->where wasn't updated when the objs_deleted list was introduced. If object sanity checking ever tried to report it for something, it would have been described as "unknown[9]" rather than as the intended "deleted". --- include/obj.h | 4 +++- src/mkobj.c | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/obj.h b/include/obj.h index 08d11dcf8..b1e95091b 100644 --- a/include/obj.h +++ b/include/obj.h @@ -1,4 +1,4 @@ -/* NetHack 3.7 obj.h $NHDT-Date: 1633802062 2021/10/09 17:54:22 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.94 $ */ +/* NetHack 3.7 obj.h $NHDT-Date: 1718999845 2024/06/21 19:57:25 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.116 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Michael Allison, 2006. */ /* NetHack may be freely redistributed. See license for details. */ @@ -82,6 +82,8 @@ struct obj { #define OBJ_ONBILL 7 /* object on shk bill */ #define OBJ_LUAFREE 8 /* object has been dealloc'd, but is ref'd by lua */ #define OBJ_DELETED 9 /* object is marked for deletion by dobjsfree() */ + /* note: OBJ_xxx values are used in obj_state_names[] in mkobj.c + so adding, removing, or renumbering these needs to change that too */ #define NOBJ_STATES 10 xint16 timed; /* # of fuses (timers) attached to this obj */ diff --git a/src/mkobj.c b/src/mkobj.c index d289dd0fe..4b73775c1 100644 --- a/src/mkobj.c +++ b/src/mkobj.c @@ -1,4 +1,4 @@ -/* NetHack 3.7 mkobj.c $NHDT-Date: 1715109575 2024/05/07 19:19:35 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.296 $ */ +/* NetHack 3.7 mkobj.c $NHDT-Date: 1718999849 2024/06/21 19:57:29 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.299 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Derek S. Ray, 2015. */ /* NetHack may be freely redistributed. See license for details. */ @@ -3185,7 +3185,7 @@ nomerge_exception(struct obj *obj) static const char *const obj_state_names[NOBJ_STATES] = { "free", "floor", "contained", "invent", "minvent", "migrating", "buried", "onbill", - "luafree" + "luafree", "deleted", }; staticfn const char *