- switched SDL.dll back to v1.2.12, the 1.2.14 has too much bugs

- added duet support. duet song format based on hawkears duet mod for the 1.1 alpha

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/1.0.1 Challenge MOD@2440 b956fd51-792f-4845-bead-9b4dfca2ff2c

1 files changed, 5 insertions, 6 deletions

diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr
index fbef9c69..5e446624 100644
--- a/Game/Code/UltraStar.dpr
+++ b/Game/Code/UltraStar.dpr
@@ -5,6 +5,7 @@ program UltraStar;
 {$R 'UltraStar.res' 'UltraStar.rc'}

 

 uses

+  acinerella in 'lib\acinerella\acinerella.pas',

   SDL in 'lib\JEDI-SDLv1.0\SDL\Pas\SDL.pas',

   moduleloader in 'lib\JEDI-SDLv1.0\SDL\Pas\moduleloader.pas',

   sdlutils in 'lib\JEDI-SDLv1.0\SDL\Pas\sdlutils.pas',

@@ -120,11 +121,10 @@ uses
 

   Windows,

   SysUtils,

-  UVideo in 'Classes\UVideo.pas',

-  acinerella in 'lib\acinerella\acinerella.pas';

+  UVideo in 'Classes\UVideo.pas';

 

 const

-  Version = 'UltraStar Deluxe v1.0.1a Challenge-Mod r7c5-10 2010-05-29';

+  Version = 'UltraStar Deluxe Challenge Duet beta 2010-06-04';

 

 var

   WndTitle: string;

@@ -315,17 +315,16 @@ begin
   Log.LogBenchmark('Loading Particel System', 1);

 

   // Joypad

-  if (Ini.Joypad = 1) OR (Params.Joypad) then begin

+  {if (Ini.Joypad = 1) OR (Params.Joypad) then begin

     Log.BenchmarkStart(1);

     Log.LogStatus('Initialize Joystick', 'Initialization');   Joy := TJoy.Create;

     Log.BenchmarkEnd(1);

     Log.LogBenchmark('Initializing Joystick', 1);

-  end;

+  end;}

 

   Log.BenchmarkEnd(0);

   Log.LogBenchmark('Loading Time', 0);

 

-

   //------------------------------

   //Start- Mainloop

   //------------------------------