Fixes: #294 - Unclobber changes to cata

Bestride · Nov 11, 2024 · 7963e6f · 7963e6f
1 parent 6c298c4
commit 7963e6f
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 225 deletions.
diff --git a/Versions/BeStride_Cata.xml b/Versions/BeStride_Cata.xml
@@ -27,9 +27,9 @@
   <Script file="Common\mounting.zone.lua"/>
   <Script file="Common\settings.lua"/>
   <Script file="Common\options.lua"/>
-  <Script file="Cata\bestride.lua"/>
-  <Script file="Cata\MountTable.lua"/>
-  <Script file="Cata\logic.lua"/>
+  <Script file="Mainline\bestride.lua"/>
+  <Script file="Mainline\MountTable.lua"/>
+  <Script file="Mainline\logic.lua"/>
   <Script file="Common\upgrade.lua"/>
   <Script file="Common\bestride.lua"/>
   <Script file="Common\opie.lua"/>

diff --git a/Versions/Cata/Functions.lua b/Versions/Cata/Functions.lua
diff --git a/Versions/Cata/MountTable.lua b/Versions/Cata/MountTable.lua
diff --git a/Versions/Cata/bestride.lua b/Versions/Cata/bestride.lua
diff --git a/Versions/Cata/logic.lua b/Versions/Cata/logic.lua
diff --git a/Versions/Common/bestride.lua b/Versions/Common/bestride.lua
@@ -222,7 +222,7 @@ function BeStride:ChatCommand(input)
 		    print("Other")
 		end
 	else
-		if self.IsMainline() then
+		if self.IsMainline() or self.IsCata() then
 			Settings.OpenToCategory(self.configDialogs.mounts.id)
 		else
 			InterfaceOptionsFrame_OpenToCategory("BeStride")

diff --git a/Versions/Common/options.lua b/Versions/Common/options.lua
@@ -519,15 +519,9 @@ local optionsTable_Mounts = {
 
 local function generateMountTable()
     for _,group in pairs({"ground", "flying", "swimming", "repair", "passenger"}) do
-	    print(group)
         for key,mountID in pairs(mountTable[group]) do
             local mount = mountTable.master[mountID]
             local name = mount.name
-
-			if group == "swimming" then
-			    print(name)
-				print(mountID)
-			end
 
             options = {
                 name=name,