diff core.lua @ 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 92e0db376858
children ea20a28327b5
line wrap: on
line diff
--- 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.