From 43c593273a8c1f776141146af7f052f4081a616b Mon Sep 17 00:00:00 2001 From: "Johnny C. Lam" Date: Sat, 23 Mar 2013 21:38:41 +0000 Subject: [PATCH] Rename some methods in OvaleState to be more descriptive of their actions. git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@819 d5049fe3-3747-40f7-a4b5-f36d6801af5f --- OvaleBestAction.lua | 2 +- OvaleFrame.lua | 2 +- OvaleState.lua | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/OvaleBestAction.lua b/OvaleBestAction.lua index 7026381..a219137 100644 --- a/OvaleBestAction.lua +++ b/OvaleBestAction.lua @@ -697,7 +697,7 @@ local OVALE_COMPUTE_VISITOR = -- function OvaleBestAction:StartNewAction() OvaleState:Reset() - OvaleState:ApplySpells() + OvaleState:ApplyActiveSpells() end function OvaleBestAction:GetActionInfo(element) diff --git a/OvaleFrame.lua b/OvaleFrame.lua index 7e52f50..95bf3c5 100644 --- a/OvaleFrame.lua +++ b/OvaleFrame.lua @@ -269,7 +269,7 @@ do if spellTarget == "target" or not spellTarget then spellTarget = target end - OvaleState:AddSpellToStack(spellId, start, start + castTime, nextCast, false, OvaleGUID:GetGUID(spellTarget)) + OvaleState:ApplySpell(spellId, start, start + castTime, nextCast, false, OvaleGUID:GetGUID(spellTarget)) start, ending, priorite, element = OvaleBestAction:Compute(node) icons[2]:Update(element, start, OvaleBestAction:GetActionInfo(element)) else diff --git a/OvaleState.lua b/OvaleState.lua index 409031f..2452108 100644 --- a/OvaleState.lua +++ b/OvaleState.lua @@ -187,9 +187,9 @@ end -- Apply the effects of spells that are being cast or are in flight, allowing us to -- ignore lag or missile travel time. -function OvaleState:ApplySpells() +function OvaleState:ApplyActiveSpells() for spellId, _, startCast, endCast, nextCast, nocd, target in OvaleFuture:InFlightSpells(self.maintenant) do - OvaleState:AddSpellToStack(spellId, startCast, endCast, nextCast, nocd, target) + OvaleState:ApplySpell(spellId, startCast, endCast, nextCast, nocd, target) end end @@ -199,7 +199,7 @@ end -- endCast : fin du cast -- nextCast : temps auquel le prochain sort peut être lancé (>=endCast, avec le GCD) -- nocd : le sort ne déclenche pas son cooldown -function OvaleState:AddSpellToStack(spellId, startCast, endCast, nextCast, nocd, targetGUID) +function OvaleState:ApplySpell(spellId, startCast, endCast, nextCast, nocd, targetGUID) if not spellId or not targetGUID then return end -- 1.7.9.5