Mercurial > wow > cyborg-mmo7

changeset 20:937be4664323

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed the CyborgMMO_ prefix to some local variables, and simplified a few associated ifs.
author madcatzinc@35b17cf1-18cd-47ff-9ca3-31d6b526ef09
date Thu, 25 Apr 2013 01:30:21 +0000
parents 33ffeb90b311
children c8b19bc87787
files CyborgMMO7.lua
diffstat 1 files changed, 50 insertions(+), 58 deletions(-) [+]
line wrap: on
line diff
--- a/CyborgMMO7.lua	Thu Apr 25 01:30:16 2013 +0000
+++ b/CyborgMMO7.lua	Thu Apr 25 01:30:21 2013 +0000
@@ -23,10 +23,10 @@
 	self:SetText(CyborgMMO_StringTable[self:GetName()])
 end
 
-local CyborgMMO_VarsLoaded = false
-local CyborgMMO_EnteredWorld = false
-local CyborgMMO_LoadBinding = false
-local CyborgMMO_SaveName = GetRealmName().."_"..UnitName("player")
+local VarsLoaded = false
+local EnteredWorld = false
+local BindingsLoaded = false
+local SaveName = GetRealmName().."_"..UnitName("player")
 local CyborgMMO_Settings = nil
 
 
@@ -87,19 +87,19 @@
 end
 
 function CyborgMMO_GetSaveData()
-	if CyborgMMO_VarsLoaded then
+	if VarsLoaded then
 		if not CyborgMMO7SaveData then
 			CyborgMMO7SaveData = {}
-			CyborgMMO7SaveData[CyborgMMO_SaveName] = {}
+			CyborgMMO7SaveData[SaveName] = {}
 		end
 		CyborgMMO_LoadWowCommands()
-		return CyborgMMO7SaveData[CyborgMMO_SaveName]
+		return CyborgMMO7SaveData[SaveName]
 	end
 	return nil
 end
 
 function CyborgMMO_SetSaveData(data, index)
-	if CyborgMMO_VarsLoaded then
+	if VarsLoaded then
 		CyborgMMO_GetSaveData()[index] = data
 		CyborgMMO_ProfileKeyBindings = CyborgMMO_WowCommands
 	end
@@ -107,9 +107,9 @@
 
 function CyborgMMO_Event(self, event, ...)
 	if event == "VARIABLES_LOADED" then
-		CyborgMMO_VarsLoaded = true
+		VarsLoaded = true
 	elseif event == "PLAYER_ENTERING_WORLD" then
-		CyborgMMO_EnteredWorld = true
+		EnteredWorld = true
 	elseif event == "PLAYER_REGEN_DISABLED" then
 		CyborgMMO_Close()
 	else
@@ -117,48 +117,44 @@
 	end
 
 	-- Fire Loading if and only if the player is in the world and vars are loaded
-	if not CyborgMMO_LoadBinding then
-		if CyborgMMO_VarsLoaded then
-			if CyborgMMO_EnteredWorld then
-				local data = CyborgMMO_GetSaveData()
+	if not BindingsLoaded and VarsLoaded and EnteredWorld then
+		local data = CyborgMMO_GetSaveData()
 
-				CyborgMMO_RatPageModel:LoadData()
-				CyborgMMO_LoadBinding = true
+		CyborgMMO_RatPageModel:LoadData()
+		BindingsLoaded = true
 
-				ShowMacroFrame()
-				HideUIPanel(MacroFrame)
+		ShowMacroFrame()
+		HideUIPanel(MacroFrame)
 
 
-				CyborgMMO_SetupModeCallbacks(1)
-				CyborgMMO_SetupModeCallbacks(2)
-				CyborgMMO_SetupModeCallbacks(3)
+		CyborgMMO_SetupModeCallbacks(1)
+		CyborgMMO_SetupModeCallbacks(2)
+		CyborgMMO_SetupModeCallbacks(3)
 
 
-				--Reload Slider values:
-				if not data["Settings"] then
-					data["Settings"] = {}
-					data["Settings"]["Cyborg"] = 0.75
-					data["Settings"]["Plugin"] = 0.75
-					data["Settings"]["MiniMapButton"] = true
-					data["Settings"]["CyborgButton"] = true
-				end
+		--Reload Slider values:
+		if not data["Settings"] then
+			data["Settings"] = {}
+			data["Settings"]["Cyborg"] = 0.75
+			data["Settings"]["Plugin"] = 0.75
+			data["Settings"]["MiniMapButton"] = true
+			data["Settings"]["CyborgButton"] = true
+		end
 
-				CyborgMMO_Settings = data["Settings"]
+		CyborgMMO_Settings = data["Settings"]
 
-				CyborgMMO_OptionPageCyborgSizeSlider:SetValue(CyborgMMO_Settings["Cyborg"])
-				CyborgMMO_SetOpenButtonSize(CyborgMMO_Settings["Cyborg"])
-				CyborgMMO_OptionPagePluginSizeSlider:SetValue(CyborgMMO_Settings["Plugin"])
-				CyborgMMO_SetMainPageSize(CyborgMMO_Settings["Plugin"])
+		CyborgMMO_OptionPageCyborgSizeSlider:SetValue(CyborgMMO_Settings["Cyborg"])
+		CyborgMMO_SetOpenButtonSize(CyborgMMO_Settings["Cyborg"])
+		CyborgMMO_OptionPagePluginSizeSlider:SetValue(CyborgMMO_Settings["Plugin"])
+		CyborgMMO_SetMainPageSize(CyborgMMO_Settings["Plugin"])
 
-				CyborgMMO_SetMiniMapButton(CyborgMMO_Settings["MiniMapButton"])
-				CyborgMMO_SetCyborgHeadButton(CyborgMMO_Settings["CyborgButton"])
+		CyborgMMO_SetMiniMapButton(CyborgMMO_Settings["MiniMapButton"])
+		CyborgMMO_SetCyborgHeadButton(CyborgMMO_Settings["CyborgButton"])
 
-				local xmin,ymin = Minimap:GetLeft(),Minimap:GetBottom()
-				CyborgMMO_MiniMapButtonReposition(math.deg(math.atan2(ymin, xmin)))
-				-- Close the main window for now
-				CyborgMMO_Close()
-			end
-		end
+		local xmin,ymin = Minimap:GetLeft(),Minimap:GetBottom()
+		CyborgMMO_MiniMapButtonReposition(math.deg(math.atan2(ymin, xmin)))
+		-- Close the main window for now
+		CyborgMMO_Close()
 	end
 end
 
@@ -245,26 +241,22 @@
 end
 
 function CyborgMMO_SetMainPageSize(percent)
-	if CyborgMMO_VarsLoaded then
-		if CyborgMMO_EnteredWorld then
-			CyborgMMO_MainPage:SetScale(percent)
-			CyborgMMO_Settings["Plugin"] = percent
-			local data = CyborgMMO_GetSaveData()
-			data["Settings"] = CyborgMMO_Settings
-			CyborgMMO_OptionPagePluginSizeSlider:SetValue(percent)
-		end
+	if VarsLoaded and EnteredWorld then
+		CyborgMMO_MainPage:SetScale(percent)
+		CyborgMMO_Settings["Plugin"] = percent
+		local data = CyborgMMO_GetSaveData()
+		data["Settings"] = CyborgMMO_Settings
+		CyborgMMO_OptionPagePluginSizeSlider:SetValue(percent)
 	end
 end
 
 function CyborgMMO_SetOpenButtonSize(percent)
-	if CyborgMMO_VarsLoaded then
-		if CyborgMMO_EnteredWorld then
-			CyborgMMO_OpenButtonPage:SetScale(percent)
-			CyborgMMO_Settings["Cyborg"] = percent
-			local data = CyborgMMO_GetSaveData()
-			data["Settings"] = CyborgMMO_Settings
-			CyborgMMO_OptionPageCyborgSizeSlider:SetValue(percent)
-		end
+	if VarsLoaded and EnteredWorld then
+		CyborgMMO_OpenButtonPage:SetScale(percent)
+		CyborgMMO_Settings["Cyborg"] = percent
+		local data = CyborgMMO_GetSaveData()
+		data["Settings"] = CyborgMMO_Settings
+		CyborgMMO_OptionPageCyborgSizeSlider:SetValue(percent)
 	end
 end