# HG changeset patch # User madcatzinc@35b17cf1-18cd-47ff-9ca3-31d6b526ef09 # Date 1366853431 0 # Node ID 0b0f51236a8812c67489d32ee2ab358843cd94b4 # Parent c8b19bc87787e934ed6737d0de7295f71dd13e54 Simplified CyborgMMO_GetButtonIndex. diff -r c8b19bc87787 -r 0b0f51236a88 OptionView.lua --- a/OptionView.lua Thu Apr 25 01:30:26 2013 +0000 +++ b/OptionView.lua Thu Apr 25 01:30:31 2013 +0000 @@ -53,10 +53,12 @@ end function CyborgMMO_GetButtonIndex(name) - local row,mode = string.find(name,"Mode") + local row,mode = name:match('Row(.)Mode(.)') + row = tonumber(row, 16) + mode = tonumber(mode) local modeStr = string.sub(name, mode +1,mode+2) local rowStr = string.sub(name, row-1,row-1) - return (CyborgMMO_GetNumberFromHexLetter(rowStr) + ((CyborgMMO_GetNumberFromHexLetter(modeStr) - 1) * 13)) + return (mode-1) * 13 + row end function CyborgMMO_ShowProfileTooltip(self) @@ -80,26 +82,6 @@ GameTooltip:Hide() end -function CyborgMMO_GetNumberFromHexLetter(str) - local number = 0 - if str == "A" then - number = 10 - elseif str == "B" then - number = 11 - elseif str == "C" then - number = 12 - elseif str == "D" then - number = 13 - elseif str == "E" then - number = 14 - elseif str == "F" then - number = 15 - else - number = tonumber(str) - end - return number -end - function CyborgMMO_SetNewKeybind(keyOrButton) local previous = CyborgMMO_WowCommands[CyborgMMO_GetButtonIndex(lastButton)] CyborgMMO_WowCommands[CyborgMMO_GetButtonIndex(lastButton)] = keyOrButton