Mercurial > wow > cyborg-mmo7

diff OptionView.lua @ 29:e8a004a4177b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged the ProfileKeyBindings and WowCommands variables (they were pointing at the same value).
author madcatzinc@35b17cf1-18cd-47ff-9ca3-31d6b526ef09
date Thu, 25 Apr 2013 01:31:06 +0000
parents d18ce89b6d09
children 72adde883f46
line wrap: on
line diff
--- a/OptionView.lua	Thu Apr 25 01:31:01 2013 +0000
+++ b/OptionView.lua	Thu Apr 25 01:31:06 2013 +0000
@@ -39,16 +39,12 @@
 	local buttonStr = CyborgMMO_StringTable[("CyborgMMO_OptionPageRebindMouseRow"..index.."Name")]
 
 	CyborgMMO_BindingFrameButtonName:SetText(buttonStr.." Mode "..mode)
-	CyborgMMO_BindingFrameKey:SetText(CyborgMMO_StringTable["CyborgMMO_CurrentBinding"].." "..CyborgMMO_WowCommands[CyborgMMO_GetButtonIndex(lastButton)])
+	CyborgMMO_BindingFrameKey:SetText(CyborgMMO_StringTable["CyborgMMO_CurrentBinding"].." "..CyborgMMO_ProfileKeyBindings[CyborgMMO_GetButtonIndex(lastButton)])
 	CyborgMMO_BindingFrame:Show()
 end
 
 function CyborgMMO_SetBindingButtonText(name)
-	if not CyborgMMO_WowCommands then
-		CyborgMMO_LoadWowCommands()
-	end
-
-	local binding = CyborgMMO_WowCommands[CyborgMMO_GetButtonIndex(name)]
+	local binding = CyborgMMO_ProfileKeyBindings[CyborgMMO_GetButtonIndex(name)]
 	getglobal(name):SetText(binding)
 end
 
@@ -83,7 +79,7 @@
 end
 
 function CyborgMMO_SetNewKeybind(keyOrButton)
-	CyborgMMO_WowCommands[CyborgMMO_GetButtonIndex(lastButton)] = keyOrButton
+	CyborgMMO_ProfileKeyBindings[CyborgMMO_GetButtonIndex(lastButton)] = keyOrButton
 	CyborgMMO_SetBindingButtonText(lastButton)
 	CyborgMMO_BindingFrame:Hide()
 	CyborgMMO_RatPageModel:LoadData()