From 206e9668f1ae75f1998e0615f753d551fb121ebd Mon Sep 17 00:00:00 2001 From: PatR Date: Sun, 26 Jan 2020 02:58:18 -0800 Subject: [PATCH] achievement tracking oversight obj->record_achieve_special (overlay of obj->corpsenm) is no longer used. --- include/obj.h | 3 +-- src/sp_lev.c | 7 +++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/include/obj.h b/include/obj.h index 6b0d9c5e9..1cf298dba 100644 --- a/include/obj.h +++ b/include/obj.h @@ -1,4 +1,4 @@ -/* NetHack 3.6 obj.h $NHDT-Date: 1508827590 2017/10/24 06:46:30 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.60 $ */ +/* NetHack 3.6 obj.h $NHDT-Date: 1580036271 2020/01/26 10:57:51 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.66 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Michael Allison, 2006. */ /* NetHack may be freely redistributed. See license for details. */ @@ -114,7 +114,6 @@ struct obj { #define leashmon corpsenm /* gets m_id of attached pet */ #define fromsink corpsenm /* a potion from a sink */ #define novelidx corpsenm /* 3.6 tribute - the index of the novel title */ -#define record_achieve_special corpsenm int usecount; /* overloaded for various things that tally */ #define spestudied usecount /* # of times a spellbook has been studied */ unsigned oeaten; /* nutrition left in food, if partly eaten */ diff --git a/src/sp_lev.c b/src/sp_lev.c index 3a76dbb72..ee40ce331 100644 --- a/src/sp_lev.c +++ b/src/sp_lev.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 sp_lev.c $NHDT-Date: 1574646949 2019/11/25 01:55:49 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.141 $ */ +/* NetHack 3.6 sp_lev.c $NHDT-Date: 1580036285 2020/01/26 10:58:05 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.148 $ */ /* Copyright (c) 1989 by Jean-Christophe Collet */ /* NetHack may be freely redistributed. See license for details. */ @@ -1571,10 +1571,13 @@ struct mkroom *croom; /* * If this is a specific item of the right type and it is being - * created on the right level, flag it as the designated item + * created on the right level, record its obj->o_id to be able + * to recognize it as the designated item * used to detect a special achievement (to whit, reaching and * exploring the target level, although the exploration part * might be short-circuited if a monster brings object to hero). + * Achievement is accomplished and the recorded o_id is cleared + * if/when it gets added into hero's inventory. * * Random items of the appropriate type won't trigger a false * match--they'll fail the (id != -1) test above--but the level