From 9256dcd5ec3a4edab824085d2227904bc89510b0 Mon Sep 17 00:00:00 2001 From: iks Date: Sun, 10 Feb 2013 09:20:56 +0000 Subject: [PATCH] Fixed bug of compare_weapons service which weapon on right arm is displayed as another weapon which is selected from left arm or non-wielded ones when selecting 2nd weapon. --- src/bldg.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/bldg.c b/src/bldg.c index ea331c72a..878d3abf7 100644 --- a/src/bldg.c +++ b/src/bldg.c @@ -3980,8 +3980,14 @@ static int compare_weapons(int bcost) /* List the new values */ list_weapon(o_ptr[i], row, col); compare_weapon_aux1(o_ptr[i], col, row + 8); + + /* Copy back the original weapon into the weapon slot */ + object_copy(i_ptr, &orig_weapon); } + /* Reset the values for the old weapon */ + calc_bonuses(); + character_xtra = old_character_xtra; #ifdef JP @@ -4025,11 +4031,7 @@ static int compare_weapons(int bcost) } } - /* Copy back the original weapon into the weapon slot */ - object_copy(i_ptr, &orig_weapon); - - /* Reset the values for the old weapon */ - calc_bonuses(); + /* Restore the screen */ screen_load(); /* Done */ -- 2.11.0