Quantcast

Ensure OvaleEclipse loads after OvalePower.

Johnny C. Lam [11-15-13 - 19:57]
Ensure OvaleEclipse loads after OvalePower.

OvalePower maintains the eclipse energy level for the state machine that
gets manipulated by OvaleEclipse.

git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@1173 d5049fe3-3747-40f7-a4b5-f36d6801af5f
Filename
Ovale.toc
OvaleEclipse.lua
diff --git a/Ovale.toc b/Ovale.toc
index 2a6331d..e211cf4 100644
--- a/Ovale.toc
+++ b/Ovale.toc
@@ -46,7 +46,6 @@ OvaleSwing.lua
 OvaleAura.lua
 OvaleComboPoints.lua
 OvaleCooldown.lua
-OvaleEclipse.lua
 OvaleOptions.lua
 OvalePower.lua
 OvaleRecount.lua
@@ -54,6 +53,7 @@ OvaleRunes.lua
 OvaleSkada.lua
 #
 OvaleCompile.lua
+OvaleEclipse.lua
 OvaleFuture.lua
 OvaleIcone.lua
 OvaleIcone.xml
diff --git a/OvaleEclipse.lua b/OvaleEclipse.lua
index 4007113..758a44d 100644
--- a/OvaleEclipse.lua
+++ b/OvaleEclipse.lua
@@ -114,6 +114,8 @@ end

 --[[----------------------------------------------------------------------------
 	State machine for simulator.
+
+	AFTER: OvalePower
 --]]----------------------------------------------------------------------------

 --<public-static-properties>
@@ -125,12 +127,11 @@ OvaleEclipse.statePrototype = {
 --<public-static-methods>
 -- Initialize the state.
 function OvaleEclipse:InitializeState(state)
-	state.eclipseDirection = nil
+	state.eclipseDirection = 0
 end

 -- Reset the state to the current conditions.
 function OvaleEclipse:ResetState(state)
-	state.eclipse = self.eclipse or 0
 	state.eclipseDirection = self.eclipseDirection
 end