From c8c7a463ff54ecb6e67c807ebfe68f77fd0897cd Mon Sep 17 00:00:00 2001 From: "nethack.rankin" Date: Thu, 3 Apr 2003 03:59:40 +0000 Subject: [PATCH] fix B02001 - WIZKIT artifacts Fix the reported bug of artifacts created via wizard mode WIZKIT being "forgotten" and possibly duplicated during play. Perform artifact initialization before $WIZKIT processing; role info needed by the former is already sufficiently set up by that point. --- doc/fixes34.2 | 1 + src/allmain.c | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/doc/fixes34.2 b/doc/fixes34.2 index 1cdc7b107..04aea105d 100644 --- a/doc/fixes34.2 +++ b/doc/fixes34.2 @@ -33,6 +33,7 @@ jumping over a sokobon pit would result in the player next to, not in, the pit don't let arrow, rock or dart traps provide an infinite number of objects dropping from height or throwing a normal container may damage contents some Magicbane messages treated "erinys" as plural +initialize artifacts before processing $WIZKIT Platform- and/or Interface-Specific Fixes diff --git a/src/allmain.c b/src/allmain.c index 6e3070414..f9e09b851 100644 --- a/src/allmain.c +++ b/src/allmain.c @@ -1,4 +1,4 @@ -/* SCCS Id: @(#)allmain.c 3.4 2002/01/04 */ +/* SCCS Id: @(#)allmain.c 3.4 2003/04/02 */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* NetHack may be freely redistributed. See license for details. */ @@ -495,10 +495,11 @@ newgame() * and init_artifacts() */ init_dungeons(); /* must be before u_init() to avoid rndmonst() - * creating odd monsters for initial tins and - * eggs */ + * creating odd monsters for any tins and eggs + * in hero's initial inventory */ + init_artifacts(); /* before u_init() in case $WIZKIT specifies + * any aritfacts */ u_init(); - init_artifacts(); #ifndef NO_SIGNAL (void) signal(SIGINT, (SIG_RET_TYPE) done1); -- 2.40.0