Mercurial > wow > ouroloot
changeset 92:01cfbfa96dd6
Last bits of cleanup and testing.
author | Farmbuyer of US-Kilrogg <farmbuyer@gmail.com> |
---|---|
date | Tue, 17 Jul 2012 03:24:36 +0000 |
parents | 2ef80188a547 |
children | ea20a28327b5 |
files | .pkgmeta LibFarmbuyer.lua core.lua gui.lua |
diffstat | 4 files changed, 31 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/.pkgmeta Mon Jul 02 23:49:11 2012 +0000 +++ b/.pkgmeta Tue Jul 17 03:24:36 2012 +0000 @@ -7,6 +7,8 @@ libs/CallbackHandler-1.0: url: svn://svn.wowace.com/wow/callbackhandler/mainline/trunk/CallbackHandler-1.0 tag: latest + # for Ace3 stuff, it's usually better to grab the alphas (they get tested) + # than waiting for bugfixes to get tagged libs/AceAddon-3.0: url: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceAddon-3.0 libs/AceEvent-3.0:
--- a/LibFarmbuyer.lua Mon Jul 02 23:49:11 2012 +0000 +++ b/LibFarmbuyer.lua Tue Jul 17 03:24:36 2012 +0000 @@ -55,7 +55,7 @@ Ditto for table recycling. ]] -local MAJOR, MINOR = "LibFarmbuyer", 18 +local MAJOR, MINOR = "LibFarmbuyer", 19 assert(LibStub,MAJOR.." requires LibStub") local lib = LibStub:NewLibrary(MAJOR, MINOR) if not lib then return end @@ -252,6 +252,10 @@ _G.SlashCmdList.DUMP("LibF_DEBUG") end else + -- make sure earlier lib's members aren't lingering + lib.author_debug = nil + _G.safeprint = nil + _G.safeiprint = nil lib.tabledump = lib.nullfunc end lib.dumptable = lib.tabledump
--- a/core.lua Mon Jul 02 23:49:11 2012 +0000 +++ b/core.lua Tue Jul 17 03:24:36 2012 +0000 @@ -327,11 +327,9 @@ do local cc = {} local function extract (color_info) - local r = _G.math.floor(255*color_info.r+0.5) - local g = _G.math.floor(255*color_info.g+0.5) - local b = _G.math.floor(255*color_info.b+0.5) - local hex = ("|cff%.2x%.2x%.2x"):format(r,g,b) - return { r=r, g=g, b=b, a=1, hex=hex } + local hex = ("|cff%.2x%.2x%.2x"):format(255*color_info.r, + 255*color_info.g, 255*color_info.b) + return { r=color_info.r, g=color_info.g, b=color_info.b, a=1, hex=hex } end local function fill_out_class_colors() for class,color in pairs(CUSTOM_CLASS_COLORS or RAID_CLASS_COLORS) do @@ -1941,9 +1939,11 @@ if newer_warning then local pop = addon.format_hypertext ([[click here]], ITEM_QUALITY_UNCOMMON, function() - -- Sadly, this is not generated by the packager, so hardcode it for now. - -- The 'data' field is handled differently for onshow than for other callbacks. - StaticPopup_Show("OUROL_URL", --[[text_arg1=]]nil, --[[text_arg2=]]nil, + -- Sadly, this is not generated by the packager, so hardcode it + -- for now. The 'data' field is handled differently for onshow + -- than for other callbacks. + StaticPopup_Show("OUROL_URL", + --[[text_arg1=]]nil, --[[text_arg2=]]nil, --[[data=]][[http://www.curse.com/addons/wow/ouroloot]]) end) local ping = addon.format_hypertext ([[click here]], ITEM_QUALITY_UNCOMMON, 'DoPing') @@ -2491,12 +2491,11 @@ >need to scan and replace Detecting A is strictly an optimization. We should be able to do this code safely in all cases. Important to note: a local winner - will always be at index 1, but a winner at index 1 does not necessarily - mean it was locally generated (e.g., if the local itemfilter drops - it but a remote player does an improv). Just do the general case - until/unless this becomes a problem. + will always be at index 1, but a winner at index 1 does not + necessarily mean it was locally generated (e.g., if the local + itemfilter drops it but a remote player does an improv). Just + do the general case until/unless this becomes a problem. ]] ---XXX this branch still needs to be tested with live data local cache = g_uniques:SEARCH(exist) local looti,hi,ui = cache.loot, cache.history, cache.history_may @@ -2656,7 +2655,7 @@ return self:Print("Saved text number must be 1 - "..#s) end local save = s[num] - self:Print("Overwriting current loot data with saved text #%d '%s'", num, save.name) + self:Print("Overwriting current loot data with saved text #%d '%s'",num,save.name) self:Clear(--[[verbose_p=]]false) -- Clear will already have displayed the window, and re-selected the first -- tab. Set these up for when the text tabs are clicked.
--- a/gui.lua Mon Jul 02 23:49:11 2012 +0000 +++ b/gui.lua Tue Jul 17 03:24:36 2012 +0000 @@ -1219,7 +1219,7 @@ icon:Show() cellFrame.text:SetPoint("LEFT", icon, "RIGHT", 1, 0) local color = addon.class_colors[e.person_class] - cellFrame.text:SetTextColor(color.r,color.g,color.b,1) + cellFrame.text:SetTextColor(color.r,color.g,color.b,color.a) else if cellFrame.icontexture then cellFrame.icontexture:Hide() @@ -1418,9 +1418,9 @@ <Right>-click any row to display a dropdown menu. The menu is different for the Player column than it is for the Item/Notes columns, and different for loot entries than it is for other rows.]] -tabs_CLI_special["eoi"] = function (name) - -- try and scroll to a specific boss/player -end +--tabs_CLI_special["eoi"] = function (name) +-- -- try and scroll to a specific boss/player? +--end -- Tab 2/3 (generated text) @@ -1515,7 +1515,8 @@ h.itemlink, addon:colorize(h.OLwho,h.OLclass)) if numleft < 1 then history_filter_who = nil - _d:GetUserData("histST"):SetFilter(history_filter_by_recent) + --_d:GetUserData("histST"):SetFilter(history_filter_by_recent) + histST:SetFilter(history_filter_by_recent) setstatus(hist_normal_status) end else @@ -2503,7 +2504,10 @@ -- try to get everything to update, rebuild, refresh... ugh, no self.display:Hide() end - if self.NOLOAD then return end -- don't even try + if self.NOLOAD then + -- don't even try + return + end -- This probably causes taint... hm. local prev_fade_time = UIDROPDOWNMENU_SHOW_TIME @@ -2938,7 +2942,7 @@ -- second click if data.name and text then data.instance = text - -- not "resuing" this dialog in the same sense as with loot + -- not "reusing" this dialog in the same sense as with loot dialog.data = nil dialog:Hide() local getsnap = StaticPopup_Show("OUROL_EOI_INSERT_INCLUDE_RAIDERSNAP")