From 5a2ebacd3e2fe624f8e9f90890463dee23c0e5cb Mon Sep 17 00:00:00 2001
From: Parnic <parnic@parnic.com>
Date: Sat, 14 Nov 2009 04:47:03 +0000
Subject: [PATCH] - replaced libhealcomm-3 support with libhealcomm-4 support

---
 .pkgmeta                 |  2 +-
 IceHUD.toc               |  2 +-
 modules/PlayerHealth.lua | 44 ++++++++++++++++++++++++++--------------
 3 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/.pkgmeta b/.pkgmeta
index f6ebe59..ced7873 100644
--- a/.pkgmeta
+++ b/.pkgmeta
@@ -21,4 +21,4 @@ optional-dependencies:
     - libdogtag-3-0
     - libdogtag-unit-3-0
     - librangecheck-2-0
-    - libhealcomm-3-0
\ No newline at end of file
+    - libhealcomm-4-0
\ No newline at end of file
diff --git a/IceHUD.toc b/IceHUD.toc
index abafed4..a65f2a0 100644
--- a/IceHUD.toc
+++ b/IceHUD.toc
@@ -5,7 +5,7 @@
 ## Notes: Another HUD addon
 ## Version: @project-version@ (Revision: @project-revision@)
 ## SavedVariables: IceCoreDB
-## OptionalDeps: Ace2, LibSharedMedia-3.0, Waterfall-1.0, Deformat, DewdropLib, LibDogTag-3.0, LibDogTag-Unit-3.0, FuBarPlugin-2.0, LibDruidMana-1.0, LibRangeCheck-2.0, LibHealComm-3.0
+## OptionalDeps: Ace2, LibSharedMedia-3.0, Waterfall-1.0, Deformat, DewdropLib, LibDogTag-3.0, LibDogTag-Unit-3.0, FuBarPlugin-2.0, LibDruidMana-1.0, LibRangeCheck-2.0, LibHealComm-4.0
 ## X-Category: HUDs
 ## X-Website: http://www.wowace.com/projects/ice-hud/
 
diff --git a/modules/PlayerHealth.lua b/modules/PlayerHealth.lua
index 2af2e81..94613ea 100644
--- a/modules/PlayerHealth.lua
+++ b/modules/PlayerHealth.lua
@@ -81,11 +81,13 @@ function PlayerHealth.prototype:Enable(core)
 	self:RegisterEvent("UNIT_ENTERED_VEHICLE", "EnteringVehicle")
 	self:RegisterEvent("UNIT_EXITED_VEHICLE", "ExitingVehicle")
 
-	if AceLibrary:HasInstance("LibHealComm-3.0") then
-		HealComm = AceLibrary("LibHealComm-3.0")
-		HealComm.RegisterCallback(self, "HealComm_DirectHealStart", function(event, healerName, healSize, endTime, ...) self:HealComm_DirectHealStart(event, healerName, healSize, endTime, ...) end)
-		HealComm.RegisterCallback(self, "HealComm_DirectHealStop", function(event, healerName, healSize, succeeded, ...) self:HealComm_DirectHealStop(event, healerName, healSize, succeeded, ...) end)
-		HealComm.RegisterCallback(self, "HealComm_HealModifierUpdate", function(event, unit, targetName, healModifier) self:HealComm_HealModifierUpdate(event, unit, targetName, healModifier) end)
+	if AceLibrary:HasInstance("LibHealComm-4.0") then
+		HealComm = AceLibrary("LibHealComm-4.0")
+		HealComm.RegisterCallback(self, "HealComm_HealStarted", function(event, casterGUID, spellID, spellType, endTime, ...) self:HealComm_HealEvent(event, casterGUID, spellID, spellType, endTime, ...) end)
+		HealComm.RegisterCallback(self, "HealComm_HealUpdated", function(event, casterGUID, spellID, spellType, endTime, ...) self:HealComm_HealEvent(event, casterGUID, spellID, spellType, endTime, ...) end)
+		HealComm.RegisterCallback(self, "HealComm_HealDelayed", function(event, casterGUID, spellID, spellType, endTime, ...) self:HealComm_HealEvent(event, casterGUID, spellID, spellType, endTime, ...) end)
+		HealComm.RegisterCallback(self, "HealComm_HealStopped", function(event, casterGUID, spellID, spellType, interrupted, ...) self:HealComm_HealEvent(event, casterGUID, spellID, spellType, interrupted, ...) end)
+		HealComm.RegisterCallback(self, "HealComm_ModifierChanged", function(event, guid) self:HealComm_ModifierChanged(event, guid) end)
 	end
 
 	if (self.moduleSettings.hideBlizz) then
@@ -99,19 +101,31 @@ function PlayerHealth.prototype:Enable(core)
 	--self:Update(self.unit)
 end
 
-function PlayerHealth.prototype:HealComm_DirectHealStart(event, healerName, healSize, endTime, ...)
-	incomingHealAmt = healSize
+function PlayerHealth.prototype:HealComm_HealEvent(event, casterGUID, spellID, spellType, endTime, ...)
+	local bFoundMe = false
+	for i=1, select("#", ...) do
+		if select(i, ...) == UnitGUID("player") then
+			bFoundMe = true
+			break
+		end
+	end
+
+	if not bFoundMe then
+		return
+	end
+
+	incomingHealAmt = HealComm:GetHealAmount(UnitGUID("player"), HealComm.ALL_HEALS)
+	if incomingHealAmt == nil then
+		incomingHealAmt = 0
+	end
 	self:Update()
 end
 
-function PlayerHealth.prototype:HealComm_DirectHealStop(event, healerName, healSize, succeeded, ...)
-	incomingHealAmt = 0
-	self:Update()
-end
-
-function PlayerHealth.prototype:HealComm_HealModifierUpdate(event, unit, targetName, healModifier)
-	incomingHealAmt = incomingHealAmt * healModifier
-	self:Update()
+function PlayerHealth.prototype:HealComm_ModifierChanged(event, guid)
+	if guid == UnitGUID("player") then
+		incomingHealAmt = incomingHealAmt * HealComm:GetHealModifier(guid)
+		self:Update()
+	end
 end