comparison Main.lua @ 7:17900d196389

Cleanup.
author James D. Callahan III <jcallahan@curse.com>
date Mon, 30 Apr 2012 01:16:30 -0500
parents e987658a8c7d
children 1b4111ac80c6
comparison
equal deleted inserted replaced
6:e987658a8c7d 7:17900d196389
36 } 36 }
37 37
38 38
39 local EVENT_MAPPING = { 39 local EVENT_MAPPING = {
40 LOOT_OPENED = true, 40 LOOT_OPENED = true,
41 MERCHANT_SHOW = "MERCHANT_UPDATE", 41 MERCHANT_SHOW = "UpdateMerchantItems",
42 MERCHANT_UPDATE = true, 42 MERCHANT_UPDATE = "UpdateMerchantItems",
43 PLAYER_TARGET_CHANGED = true, 43 PLAYER_TARGET_CHANGED = true,
44 UNIT_QUEST_LOG_CHANGED = true, 44 UNIT_QUEST_LOG_CHANGED = true,
45 UNIT_SPELLCAST_FAILED = "HandleSpellFailure", 45 UNIT_SPELLCAST_FAILED = "HandleSpellFailure",
46 UNIT_SPELLCAST_FAILED_QUIET = "HandleSpellFailure", 46 UNIT_SPELLCAST_FAILED_QUIET = "HandleSpellFailure",
47 UNIT_SPELLCAST_INTERRUPTED = "HandleSpellFailure", 47 UNIT_SPELLCAST_INTERRUPTED = "HandleSpellFailure",
108 108
109 local function ItemLinkToID(item_link) 109 local function ItemLinkToID(item_link)
110 if not item_link then 110 if not item_link then
111 return 111 return
112 end 112 end
113 local id = item_link:match("item:(%d+)") 113 return tonumber(item_link:match("item:(%d+)"))
114 return id and tonumber(id) or nil
115 end 114 end
116 115
117 116
118 do 117 do
119 local UNIT_TYPE_BITMASK = 0x007 118 local UNIT_TYPE_BITMASK = 0x007
303 ("^%s$"):format(_G.ITEM_REQ_ARENA_RATING_BG:gsub("%%d", "(%%d+)")), 302 ("^%s$"):format(_G.ITEM_REQ_ARENA_RATING_BG:gsub("%%d", "(%%d+)")),
304 ("^%s$"):format(_G.ITEM_REQ_ARENA_RATING_3V3_BG:gsub("%%d", "(%%d+)")), 303 ("^%s$"):format(_G.ITEM_REQ_ARENA_RATING_3V3_BG:gsub("%%d", "(%%d+)")),
305 } 304 }
306 305
307 306
308 function WDP:MERCHANT_UPDATE() 307 function WDP:UpdateMerchantItems()
309 local unit_type, unit_idnum = self:ParseGUID(_G.UnitGUID("target")) 308 local unit_type, unit_idnum = self:ParseGUID(_G.UnitGUID("target"))
310 309
311 if unit_type ~= private.UNIT_TYPES.NPC or not unit_idnum then 310 if unit_type ~= private.UNIT_TYPES.NPC or not unit_idnum then
312 return 311 return
313 end 312 end