Fixes for Cata Classic

kaminaris · Nov 7, 2024 · 80ebb47 · 80ebb47
1 parent 937fe71
commit 80ebb47
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 19 deletions.
diff --git a/Buttons.lua b/Buttons.lua
@@ -281,12 +281,12 @@ function MaxDps:AddStandardButton(button)
             self:AddItemButton(button)
             return
         elseif type == 'spell' then
-            if MaxDps:IsRetailWow() then
+            --if MaxDps:IsRetailWow() then
                 local spellInfo = GetSpellInfo(actionType)
                 spellId = spellInfo and spellInfo.spellID
-            else
-                spellId = select(7,GetSpellInfo(actionType))
-            end
+            --else
+            --    spellId = select(7,GetSpellInfo(actionType))
+            --end
         end
 
         if spellId and button then
@@ -734,13 +734,9 @@ function MaxDps:GlowSpell(spellId)
     --    end
     end
     if foundspell == false then
-        local spellName
-        if MaxDps:IsRetailWow() then
-            local spellInfo = GetSpellInfo(spellId)
-            spellName = spellInfo and spellInfo.name
-        else
-            spellName = GetSpellInfo(spellId)
-        end
+        local spellInfo = GetSpellInfo(spellId)
+        local spellName = spellInfo and spellInfo.name
+
         self:Print(
             self.Colors.Error ..
             'Spell not found on action bars: ' ..

diff --git a/Core.lua b/Core.lua
@@ -7866,17 +7866,13 @@ function MaxDps:UpdateSpellsAndTalents()
     end
 
     local className, classFilename, classId = UnitClass("player")
-    local currentSpec
-    if MaxDps:IsRetailWow() then
-        currentSpec = GetSpecialization()
-    else
-        currentSpec = GetSpecializationInfoForClassID(classId)
-    end
+    local currentSpec = GetSpecialization()
     local id, name, description, icon, background, role
     if MaxDps:IsRetailWow() then
         id, name, description, icon, background, role = GetSpecializationInfo(currentSpec)
     else
-        id, name, description, icon, background, role = GetSpecializationInfoForSpecID(currentSpec)
+        --id, name, description, icon, background, role = GetSpecializationInfoForSpecID(currentSpec)
+        id, name, description, icon, background, role = GetSpecializationInfoForClassID(classId, currentSpec)
     end
 
     if MaxDps:IsRetailWow() and MaxDpsSpellTable and id and idtoclass and idtoclass[classId] and idtospec and idtospec[id] then
@@ -7895,7 +7891,7 @@ function MaxDps:UpdateSpellsAndTalents()
         --
         MaxDps.SpellTable = MaxDpsSpellTable[idtoclass[classId]][idtospec[id]]
     end
-    if not MaxDps:IsRetailWow() and  MaxDpsSpellTable and id and idtoclass and idtoclass[classId] then
+    if not MaxDps:IsRetailWow() and MaxDpsSpellTable and id and idtoclass and idtoclass[classId] then
         -- Insert Racials
         --MaxDpsSpellTable[idtoclass[classId]][name]["Berserking"] = 26297
         --MaxDpsSpellTable[idtoclass[classId]][name]["HyperOrganicLightOriginator"] = 312924