aboutsummaryrefslogtreecommitdiffstats
path: root/Game/Code/Screens/UScreenEditSub.pas
diff options
context:
space:
mode:
authorwhiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c>2008-03-30 16:44:20 +0000
committerwhiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c>2008-03-30 16:44:20 +0000
commitd520f9f6ed8a3a0cb8e3063040db19758b7c6f38 (patch)
treeb506e6c32265bea8d5dc5b96cab09ad8dd60b12c /Game/Code/Screens/UScreenEditSub.pas
parent61cbc6464e0c9469c4ddcf35285db220a18f153f (diff)
downloadusdx-d520f9f6ed8a3a0cb8e3063040db19758b7c6f38.tar.gz
usdx-d520f9f6ed8a3a0cb8e3063040db19758b7c6f38.tar.xz
usdx-d520f9f6ed8a3a0cb8e3063040db19758b7c6f38.zip
Prepared some classes for enhanced Song loading.
Commited to work with s_alexander in this task. Song loading doesn't work at this point git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@983 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to '')
-rw-r--r--Game/Code/Screens/UScreenEditSub.pas15
1 files changed, 8 insertions, 7 deletions
diff --git a/Game/Code/Screens/UScreenEditSub.pas b/Game/Code/Screens/UScreenEditSub.pas
index bf479c41..51fd6ebc 100644
--- a/Game/Code/Screens/UScreenEditSub.pas
+++ b/Game/Code/Screens/UScreenEditSub.pas
@@ -128,10 +128,11 @@ begin
'S':
begin
// Save Song
- if SDL_ModState = KMOD_LSHIFT then
+ // to - do : new Song management
+ {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
@@ -1169,14 +1170,14 @@ begin
ResetSingTemp;
- try
+ {try // to - do : new Song management
//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
@@ -1199,8 +1200,8 @@ begin
Lines[0].Current := 0;
CurrentNote := 0;
Lines[0].Line[0].Note[0].Color := 1;
-
- AudioPlayback.Open(CurrentSong.Path + CurrentSong.Mp3);
+ // to - do : new Song management
+ AudioPlayback.Open({CurrentSong.Path + }CurrentSong.Mp3);
//Set Down Music Volume for Better hearability of Midi Sounds
//Music.SetVolume(40);