Remove playlists, rework how the wheel options are organized. They're…

… now defined by one master table
Simply-Love · Jan 2, 2025 · 1b8c8d7 · 1b8c8d7
1 parent cf5cb5f
commit 1b8c8d7
Show file tree

Hide file tree

Showing 4 changed files with 184 additions and 168 deletions.
diff --git a/BGAnimations/ScreenSelectMusic overlay/SortMenu/SortMenu_InputHandler.lua b/BGAnimations/ScreenSelectMusic overlay/SortMenu/SortMenu_InputHandler.lua
@@ -24,13 +24,6 @@ local input = function(event)
 				overlay:queuecommand("DirectInputToEngine")
 
 				-- the player wants to change modes, for example from ITG to FA+
-			elseif focus.kind == "Playlist" then
-				local path = THEME:GetPathO("", "Playlists/" .. focus.new_overlay .. ".txt")
-				SONGMAN:SetPreferredSongs(path, --[[isAbsolute=]]true);
-				if SONGMAN:GetPreferredSortSongs() then
-					overlay:queuecommand("DirectInputToEngine")
-					SCREENMAN:GetTopScreen():GetMusicWheel():ChangeSort("SortOrder_Preferred")
-				end
 			elseif focus.kind == "ChangeMode" then
 				SL.Global.GameMode = focus.change
 				for player in ivalues(GAMESTATE:GetHumanPlayers()) do

diff --git a/BGAnimations/ScreenSelectMusic overlay/SortMenu/WheelItemMT.lua b/BGAnimations/ScreenSelectMusic overlay/SortMenu/WheelItemMT.lua
@@ -82,7 +82,7 @@ return {
 				self.new_overlay = info[2]
 			end
 			local toptext    = self.kind ~= "" and THEME:GetString("ScreenSelectMusic", self.kind) or ""
-			local bottomtext = self.kind == "Playlist" and info[2] or THEME:GetString(self.kind == "ChangeMode" and "ScreenSelectPlayMode" or "ScreenSelectMusic", info[2])
+			local bottomtext = THEME:GetString(self.kind == "ChangeMode" and "ScreenSelectPlayMode" or "ScreenSelectMusic", info[2])
 
 			self.top_text:settext(toptext)
 			self.bottom_text:settext(bottomtext)