From e2cd03822f28a4866f98fb0893a73b02bd60ce03 Mon Sep 17 00:00:00 2001
From: whiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Thu, 5 Apr 2007 14:37:58 +0000
Subject: Added Playlist Support Working correct with Standard Mode Only for
 now Now working on Playlist Support for Party Mode

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@59 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Game/Code/Screens/UScreenSong.pas | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

(limited to 'Game/Code/Screens/UScreenSong.pas')

diff --git a/Game/Code/Screens/UScreenSong.pas b/Game/Code/Screens/UScreenSong.pas
index 694ecc39..6a1df197 100644
--- a/Game/Code/Screens/UScreenSong.pas
+++ b/Game/Code/Screens/UScreenSong.pas
@@ -314,12 +314,26 @@ begin
         begin
           if Length(Songs.Song) > 0 then begin
             if not CatSongs.Song[Interaction].Main then begin // clicked on Song
-              ScreenSongMenu.MenuShow(SM_Main);
+              if CatSongs.CatNumShow = -3 then
+                ScreenSongMenu.MenuShow(SM_Playlist)
+              else
+                ScreenSongMenu.MenuShow(SM_Main);
+            end
+            else
+            begin
+              ScreenSongMenu.MenuShow(SM_Playlist_Load);
             end;
           end;
         end;
 
-      SDLK_J: //Show SongMenu
+      SDLK_P: //Show Playlist Menu
+        begin
+          if Length(Songs.Song) > 0 then begin
+              ScreenSongMenu.MenuShow(SM_Playlist_Load);
+          end;
+        end;
+
+      SDLK_J: //Show Jumpto Menu
         begin
           if Length(Songs.Song) > 0 then
           begin
@@ -699,6 +713,8 @@ begin
     end
     else if (CatSongs.CatNumShow = -2) then
       Text[TextNumber].Text := IntToStr(CatSongs.VisibleIndex(Interaction)+1) + '/' + IntToStr(VS)
+    else if (CatSongs.CatNumShow = -3) then
+      Text[TextNumber].Text := IntToStr(CatSongs.VisibleIndex(Interaction)+1) + '/' + IntToStr(VS)
     else if (Ini.Tabs_at_startup = 1) then
       Text[TextNumber].Text := IntToStr(CatSongs.Song[Interaction].CatNumber) + '/' + IntToStr(CatSongs.Song[Interaction - CatSongs.Song[Interaction].CatNumber].CatNumber)
     else
@@ -1144,8 +1160,18 @@ begin
     UpdateLCD;
   end;
 
+  //Playlist Mode
+  if (Mode = 0) then
+  begin
+    //If Playlist Shown -> Select Next automatically
+    if (CatSongs.CatNumShow = -3) then
+    begin
+      SelectNext;
+      ChangeMusic;
+    end;
+  end
   //Party Mode
-  if (Mode = 1) then
+  else if (Mode = 1) then
   begin
     SelectRandomSong;
   end;
-- 
cgit v1.2.3