From f03ed07bc00ddc28a77f4e81d25e7d3ee596e06d Mon Sep 17 00:00:00 2001 From: f1fth_freed0m Date: Thu, 27 Mar 2008 22:30:01 +0000 Subject: USDX is now able to load SingStar XML Songfiles using Whitesharks XML2US Parser git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@974 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/Screens/UScreenEditSub.pas | 5 ++++- Game/Code/Screens/UScreenSing.pas | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'Game/Code/Screens') diff --git a/Game/Code/Screens/UScreenEditSub.pas b/Game/Code/Screens/UScreenEditSub.pas index 1fb7bff8..bf479c41 100644 --- a/Game/Code/Screens/UScreenEditSub.pas +++ b/Game/Code/Screens/UScreenEditSub.pas @@ -1170,7 +1170,10 @@ begin ResetSingTemp; try - Error := not CurrentSong.LoadSong(); + //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 Error := True; end; diff --git a/Game/Code/Screens/UScreenSing.pas b/Game/Code/Screens/UScreenSing.pas index d75a3171..859aeb52 100644 --- a/Game/Code/Screens/UScreenSing.pas +++ b/Game/Code/Screens/UScreenSing.pas @@ -462,7 +462,10 @@ begin // FIXME: bad style, put the try-except into LoadSong() and not here try - success := CurrentSong.LoadSong(); + //Check if File is XML + if copy(CurrentSong.FileName,length(CurrentSong.FileName)-3,4) = '.xml' + then success := CurrentSong.LoadXMLSong() + else success := CurrentSong.LoadSong(); except success := false; end; -- cgit v1.2.3