tried to make songloading working with the old loader and keep all changes that were made since

starting to work on a new one *hope that worked*

you may delete your existing cover.cache (the cover cache is still NOT working)


git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1024 b956fd51-792f-4845-bead-9b4dfca2ff2c

1 files changed, 6 insertions, 8 deletions

diff --git a/Game/Code/Screens/UScreenEditSub.pas b/Game/Code/Screens/UScreenEditSub.pas
index 8ca1c3f3..8d4a3335 100644
--- a/Game/Code/Screens/UScreenEditSub.pas
+++ b/Game/Code/Screens/UScreenEditSub.pas
@@ -128,11 +128,10 @@ begin
       'S':
         begin
           // Save Song
-          // to - do : new Song management
-          {if SDL_ModState = KMOD_LSHIFT then
+          if SDL_ModState = KMOD_LSHIFT then
             SaveSong(CurrentSong, Lines[0], CurrentSong.Path + CurrentSong.FileName, true)
           else
-            SaveSong(CurrentSong, Lines[0], CurrentSong.Path + CurrentSong.FileName, false);}
+            SaveSong(CurrentSong, Lines[0], CurrentSong.Path + CurrentSong.FileName, false);
 
           {if SDL_ModState = KMOD_LSHIFT or KMOD_LCTRL + KMOD_LALT then
             // Save Song
@@ -1143,14 +1142,14 @@ begin
 
   ResetSingTemp;
 
-  {try  // to - do : new Song management
+  try 
   //Check if File is XML
    if copy(CurrentSong.FileName,length(CurrentSong.FileName)-3,4) = '.xml'
     then Error := not CurrentSong.LoadXMLSong()
     else Error := not CurrentSong.LoadSong();
-  except }
+  except
     Error := True;
-  //end;
+  end;
 
   if Error then
   begin
@@ -1173,8 +1172,7 @@ begin
     Lines[0].Current := 0;
     CurrentNote := 0;
     Lines[0].Line[0].Note[0].Color := 1;
-    // to - do : new Song management
-    AudioPlayback.Open({CurrentSong.Path + }CurrentSong.Mp3);
+    AudioPlayback.Open(CurrentSong.Path + CurrentSong.Mp3);
     //Set Down Music Volume for Better hearability of Midi Sounds
     //Music.SetVolume(40);