From eb22f7f583120343ee3f8ba54fd277fed82fafd5 Mon Sep 17 00:00:00 2001 From: PatR Date: Tue, 5 Jul 2016 04:31:51 -0700 Subject: [PATCH] fix #H4427 - confused scroll of light When scroll of light is read while confused and summons a yellow or black light, if it didn't have a user-supplied type name then user would be asked to supply one even if scroll of light was identified. Let effect()'s caller handle docall(). --- doc/fixes36.1 | 2 ++ src/read.c | 4 +--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/fixes36.1 b/doc/fixes36.1 index 605268883..2402e7cf6 100644 --- a/doc/fixes36.1 +++ b/doc/fixes36.1 @@ -312,6 +312,8 @@ when #tip's terse object drop format got interrupted by a regular message, seems hopeless; leaving it is better than always using verbose format) for #tip inside shop, credit was incorrectly given for spilled gold if that gold's stale location coordinates didn't happen to be inside the shop +when confused scroll of light summoned lights, player would be asked what to + call the scroll even if scroll of light was already identified Fixes to Post-3.6.0 Problems that Were Exposed Via git Repository diff --git a/src/read.c b/src/read.c index fbf9f8201..12e3cc002 100644 --- a/src/read.c +++ b/src/read.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 read.c $NHDT-Date: 1457660917 2016/03/11 01:48:37 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.136 $ */ +/* NetHack 3.6 read.c $NHDT-Date: 1467718299 2016/07/05 11:31:39 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.140 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* NetHack may be freely redistributed. See license for details. */ @@ -1414,8 +1414,6 @@ struct obj *sobj; /* scroll, or fake spellbook object for scroll-like spell */ (void) create_critters(1, !scursed ? &mons[PM_YELLOW_LIGHT] : &mons[PM_BLACK_LIGHT], TRUE); - if (!objects[sobj->otyp].oc_uname) - docall(sobj); } break; case SCR_TELEPORTATION: