From 168355580172b6724957bddc595fb00b407cfe8a Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Fri, 8 Jan 2010 22:47:33 +0100 Subject: Import fix from CVS: Fix application of set effects when trap of silent switching is triggered. --- src/traps.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src') diff --git a/src/traps.c b/src/traps.c index 3e9b2497..181c0bbe 100644 --- a/src/traps.c +++ b/src/traps.c @@ -1006,6 +1006,11 @@ bool player_activate_trap_type(s16b y, s16b x, object_type *i_ptr, s16b item) { object_type tmp_obj; + if (p_ptr->inventory[j].name1) + wield_set(p_ptr->inventory[j].name1, a_info[p_ptr->inventory[j].name1].set, FALSE); + if (p_ptr->inventory[i].name1) + takeoff_set(p_ptr->inventory[i].name1, a_info[p_ptr->inventory[i].name1].set); + tmp_obj = p_ptr->inventory[j]; p_ptr->inventory[j] = p_ptr->inventory[i]; p_ptr->inventory[i] = tmp_obj; -- cgit v1.2.3