From 68185d1861e44fd4a529497a118d9d1bd67d46bd Mon Sep 17 00:00:00 2001
From: Sidoine De Wispelaere <sidoine@sidoine.net>
Date: Sat, 18 Apr 2009 15:25:48 +0000
Subject: [PATCH] - bug fix: uses new format of UnitAura

git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@32 d5049fe3-3747-40f7-a4b5-f36d6801af5f
---
 Condition.lua |   12 ++++++------
 Ovale.lua     |   35 ++++++++++++++++++++++++++---------
 2 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/Condition.lua b/Condition.lua
index e0ccac3..ddf6a6f 100644
--- a/Condition.lua
+++ b/Condition.lua
@@ -79,7 +79,7 @@ Ovale.conditions=
 		local buffName = Ovale:GetSpellInfoOrNil(condition[1])
 		local i=1;
 		while (true) do
-			local name, rank, icon, count, debuffType, duration, expirationTime, isMine, isStealable =  UnitBuff("player", i);
+			local name, rank, icon, count, debuffType, duration, expirationTime, unitCaster, isStealable =  UnitBuff("player", i);
 			if (not name) then
 				break
 			end
@@ -106,7 +106,7 @@ Ovale.conditions=
 		local buffName, buffRank, buffIcon = Ovale:GetSpellInfoOrNil(condition[1])
 		i=1;
 		while (true) do
-			local name, rank, icon, count, debuffType, duration, expirationTime, isMine, isStealable =  UnitBuff("player", i);
+			local name, rank, icon, count, debuffType, duration, expirationTime, unitCaster, isStealable =  UnitBuff("player", i);
 			if (not name) then
 				break
 			end
@@ -265,11 +265,11 @@ Ovale.conditions=
 		local debuffName = Ovale:GetSpellInfoOrNil(condition[1])
 		i=1;
 		while (true) do
-			local name, rank, icon, count, debuffType, duration, expirationTime, isMine, isStealable =  UnitDebuff("target", i);
+			local name, rank, icon, count, debuffType, duration, expirationTime, unitCaster, isStealable =  UnitDebuff("target", i);
 			if (not name) then
 				break
 			end
-			if (not condition.mine or isMine) then
+			if (not condition.mine or unitCaster=="player") then
 				if (name == debuffName) then
 					local timeLeft = expirationTime - Ovale.maintenant
 					local tempsMax = avecHate(condition[2], condition.haste)
@@ -294,11 +294,11 @@ Ovale.conditions=
 		local debuffName = Ovale:GetSpellInfoOrNil(condition[1])
 		i=1;
 		while (true) do
-			local name, rank, icon, count, debuffType, duration, expirationTime, isMine, isStealable =  UnitDebuff("target", i);
+			local name, rank, icon, count, debuffType, duration, expirationTime, unitCaster, isStealable =  UnitDebuff("target", i);
 			if (not name) then
 				break
 			end
-			if (not condition.mine or isMine) then
+			if (not condition.mine or unitCaster=="player") then
 				if (name == debuffName) then
 					local timeLeft = expirationTime - Ovale.maintenant
 					if (count~=0 and condition.stacks) then
diff --git a/Ovale.lua b/Ovale.lua
index 99b9832..c2f7e83 100644
--- a/Ovale.lua
+++ b/Ovale.lua
@@ -28,7 +28,7 @@ Ovale.spellHaste = 0
 Ovale.meleeHaste = 0
 Ovale.aura = { player = {}, target = {}}
 Ovale.possibleAura = { player = {}, target = {}}
-
+Ovale.targetGUID = nil
 
 Ovale.arbre = {}
 
@@ -214,31 +214,44 @@ function Ovale:UPDATE_BINDINGS()
 	self:RemplirActionIndexes()
 end
 
+--[[
 function Ovale:SaveAura(unit, filter)
 	local i=1
 	
 	for k, v in pairs(Ovale.aura[unit]) do
 		v.dispelled = true
-		v.isMine = false
+		v.unitCaster = nil
 	end
 	
 	while (true) do
-		local name, rank, icon, count, debuffType, duration, expirationTime, isMine = UnitAura(unit, i, filter)
+		local name, rank, icon, count, debuffType, duration, expirationTime, unitCaster = UnitAura(unit, i, filter)
 		
 		if (not name) then
 			break
 		end
 		
-		if (not Ovale.aura[unit][name].isMine or not isMine) then
-			Ovale.aura[unit][name].icon = icon
-			Ovale.aura[unit][name].count = count
-			Ovale.aura[unit][name].duration = duration
-			Ovale.aura[unit][name].expirationTime = expirationTime
-			Ovale.aura[unit][name].isMine = isMine
+		if (not Ovale.aura[unit][filter][name].isMine or not isMine) then
+			Ovale.aura[unit][filter][name].icon = icon
+			Ovale.aura[unit][filter][name].count = count
+			Ovale.aura[unit][filter][name].duration = duration
+			Ovale.aura[unit][filter][name].expirationTime = expirationTime
+			Ovale.aura[unit][filter][name].unitCaster  = unitCaster 
 		end
 	end
 end
 
+function Ovale:COMBAT_LOG_EVENT_UNFILTERED(event, ...)
+	local time, event, sourceGUID, sourceName, sourceFlags, destGUID, destName, destFlags = select(1, ...)
+	if (
+	if (event 
+end
+
+function Ovale:PLAYER_TARGET_CHANGED()
+	Ovale.targetGUID = UnitGUID("target")
+	Ovale.aura.target.HELPFUL = {}
+	Ovale.aura.target.HARMFUL = {}
+end
+]]
 
 function Ovale:UNIT_AURA(event, unit)
 	if (unit == "player") then
@@ -353,6 +366,8 @@ function Ovale:OnEnable()
     self:RegisterEvent("ACTIONBAR_SLOT_CHANGED");
     self:RegisterEvent("UPDATE_BINDINGS");
     self:RegisterEvent("UNIT_AURA");
+    -- self:RegisterEvent("PLAYER_TARGET_CHANGED")
+    -- self:RegisterEvent("COMBAT_LOG_EVENT_UNFILTERED")
 	
 	if (not self.firstInit) then
 		self:FirstInit()
@@ -377,6 +392,8 @@ function Ovale:OnDisable()
     self:UnregisterEvent("CHARACTER_POINTS_CHANGED")
     self:UnregisterEvent("UPDATE_BINDINGS")
     self:UnregisterEvent("UNIT_AURA")
+    -- self:UnregisterEvent("PLAYER_TARGET_CHANGED")
+    -- self:UnregisterEvent("COMBAT_LOG_EVENT_UNFILTERED")
     self.frame:Hide()
 end
 
-- 
1.7.9.5