diff options
| author | Bardur Arantsson <bardur@scientician.net> | 2010-01-08 22:47:33 +0100 |
|---|---|---|
| committer | Bardur Arantsson <bardur@scientician.net> | 2010-01-08 23:46:24 +0100 |
| commit | 168355580172b6724957bddc595fb00b407cfe8a (patch) | |
| tree | 403057fc3ed058dffb1cb7c091f0ec5226cea029 | |
| parent | e6276fe835c0c3ea72a79959b2803b0ee7341ffd (diff) | |
Import fix from CVS: Fix application of set effects when trap of silent switching is triggered.
| -rw-r--r-- | changes.txt | 1 | ||||
| -rw-r--r-- | src/traps.c | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/changes.txt b/changes.txt index def6cae9..c2709606 100644 --- a/changes.txt +++ b/changes.txt @@ -4,6 +4,7 @@ T.o.M.E 2.3.6 - Mark *all* quest monsters properly. - Avoid generating up staircases in selected dungeons. - Mimicry cloaks of Abomination now aggravate properly. +- Properly handle item set effects with certain traps. 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; |