# HG changeset patch
# User James D. Callahan III <jcallahan@curse.com>
# Date 1342632474 18000
# Node ID 0d3c915e99bf5cc9d5e4459bc219984edca20ecd
# Parent  3a6693c99bb3c94da847cc7eda9fcf01a3ff828e
Un-comment MERCHANT_UPDATE since it no longer hard-locks the client. Change storage for merchant items to be indexed by the item ID so information about items is updated rather than duplicated.

diff -r 3a6693c99bb3 -r 0d3c915e99bf Main.lua
--- a/Main.lua	Thu Jul 05 10:22:42 2012 -0500
+++ b/Main.lua	Wed Jul 18 12:27:54 2012 -0500
@@ -48,7 +48,7 @@
     ITEM_TEXT_BEGIN = true,
     LOOT_OPENED = true,
     MERCHANT_SHOW = "UpdateMerchantItems",
-    --    MERCHANT_UPDATE = "UpdateMerchantItems",
+    MERCHANT_UPDATE = "UpdateMerchantItems",
     PET_BAR_UPDATE = true,
     PLAYER_TARGET_CHANGED = true,
     QUEST_COMPLETE = true,
@@ -962,7 +962,7 @@
                         price_string = ("%s:%s"):format(price_string, currency_list[currency_index])
                     end
                 end
-                merchant.sells[("%s:%s:[%s]"):format(item_id, stack_size, price_string)] = num_available
+                merchant.sells[item_id] = ("%s:%s:[%s]"):format(num_available, stack_size, price_string)
             end
         end