monsters putting on shirts

From the newsgroup:  code intended to prevent a monster who's wearing
a suit from putting on a shirt didn't work due to faulty logic.
This commit is contained in:
nethack.rankin
2008-09-04 20:21:06 +00:00
parent a559b0cabc
commit 1179bb964c
2 changed files with 3 additions and 2 deletions
+1
View File
@@ -373,6 +373,7 @@ lit south wall of C quest leader's room contained dark gap at secret door spot
archeologist shouldn't start with sling skill by carrying slingable touchstone archeologist shouldn't start with sling skill by carrying slingable touchstone
ensure current_fruit gets set to the correct index when setting fruit ensure current_fruit gets set to the correct index when setting fruit
option to existing entry whose fid is not the highest option to existing entry whose fid is not the highest
monsters already wearing suits can't put on shirts
Platform- and/or Interface-Specific Fixes Platform- and/or Interface-Specific Fixes
+2 -2
View File
@@ -1,4 +1,4 @@
/* SCCS Id: @(#)worn.c 3.5 2007/02/22 */ /* SCCS Id: @(#)worn.c 3.5 2008/09/03 */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -442,7 +442,7 @@ boolean creation;
m_dowear_type(mon, W_AMUL, creation, FALSE); m_dowear_type(mon, W_AMUL, creation, FALSE);
#ifdef TOURIST #ifdef TOURIST
/* can't put on shirt if already wearing suit */ /* can't put on shirt if already wearing suit */
if (!cantweararm(mon->data) || (mon->misc_worn_check & W_ARM)) if (!cantweararm(mon->data) && !(mon->misc_worn_check & W_ARM))
m_dowear_type(mon, W_ARMU, creation, FALSE); m_dowear_type(mon, W_ARMU, creation, FALSE);
#endif #endif
/* treating small as a special case allows /* treating small as a special case allows