From 5ed6620bad808381fce94f2cd67ee911b4d45bff Mon Sep 17 00:00:00 2001 From: whiteshark0 Date: Wed, 21 Mar 2007 19:19:04 +0000 Subject: git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 286 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 286 insertions(+) create mode 100644 Game/Code/UltraStar.dpr (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr new file mode 100644 index 00000000..5c598eda --- /dev/null +++ b/Game/Code/UltraStar.dpr @@ -0,0 +1,286 @@ + program UltraStar; + +{$DEFINE TRANSLATE} +//DEFINE THEMESAVE} + +{$R 'UltraStar.res' 'UltraStar.rc'} + +uses + {//Earlyer in Code Dir.. Now in SearchDir + DDKint in '..\ZLPortIO\ddkint.pas', + ZLPortIO in '..\ZLPortIO\zlportio.pas', + SQLiteTable3 in '..\SQLite\SQLiteTable3.pas', + SQLite3 in '..\SQLite\SQLite3.pas',} + Windows, + SDL, + SysUtils, + + //Menu Objects + UDisplay in 'Menu\UDisplay.pas', + UMenu in 'Menu\UMenu.pas', + UMenuStatic in 'Menu\UMenuStatic.pas', + UMenuText in 'Menu\UMenuText.pas', + UMenuButton in 'Menu\UMenuButton.pas', + UMenuInteract in 'Menu\UMenuInteract.pas', + UMenuSelect in 'Menu\UMenuSelect.pas', + UMenuSelectSlide in 'Menu\UMenuSelectSlide.pas', + UDrawTexture in 'Menu\UDrawTexture.pas', + + //Classes + UGraphic in 'Classes\UGraphic.pas', + UTexture in 'Classes\UTexture.pas', + UMusic in 'Classes\UMusic.pas', + UPliki in 'Classes\UPliki.pas', + UMain in 'Classes\UMain.pas', + UDraw in 'Classes\UDraw.pas', + URecord in 'Classes\URecord.pas', + UTime in 'Classes\UTime.pas', + TextGL in 'Classes\TextGL.pas', + USongs in 'Classes\USongs.pas', + UIni in 'Classes\UIni.pas', + USmpeg in 'SMpeg\USmpeg.pas', + ULyrics in 'Classes\ULyrics.pas', + USkins in 'Classes\USkins.pas', + UThemes in 'Classes\UThemes.pas', + ULog in 'Classes\ULog.pas', + UJoystick in 'Classes\UJoystick.pas', + ULCD in 'Classes\ULCD.pas', + ULight in 'Classes\ULight.pas', + UScores in 'Classes\UScores.pas', + ULanguage in 'Classes\ULanguage.pas', + UCovers in 'Classes\UCovers.pas', + UCatCovers in 'Classes\UCatCovers.pas', + UFiles in 'Classes\UFiles.pas', + UGraphicClasses in 'Classes\UGraphicClasses.pas', + UDLLManager in 'Classes\UDLLManager.pas', + UParty in 'Classes\UParty.pas', + + //Screens + UScreenLoading in 'Screens\UScreenLoading.pas', + UScreenWelcome in 'Screens\UScreenWelcome.pas', + UScreenMain in 'Screens\UScreenMain.pas', + UScreenName in 'Screens\UScreenName.pas', + UScreenLevel in 'Screens\UScreenLevel.pas', + UScreenSong in 'Screens\UScreenSong.pas', + UScreenSing in 'Screens\UScreenSing.pas', + UScreenScore in 'Screens\UScreenScore.pas', + UScreenOptions in 'Screens\UScreenOptions.pas', + UScreenOptionsGame in 'Screens\UScreenOptionsGame.pas', + UScreenOptionsGraphics in 'Screens\UScreenOptionsGraphics.pas', + UScreenOptionsSound in 'Screens\UScreenOptionsSound.pas', + UScreenOptionsLyrics in 'Screens\UScreenOptionsLyrics.pas', + UScreenOptionsThemes in 'Screens\UScreenOptionsThemes.pas', + UScreenOptionsRecord in 'Screens\UScreenOptionsRecord.pas', + UScreenEditSub in 'Screens\UScreenEditSub.pas', + UScreenEdit in 'Screens\UScreenEdit.pas', + UScreenEditConvert in 'Screens\UScreenEditConvert.pas', + UScreenEditHeader in 'Screens\UScreenEditHeader.pas', + UScreenOpen in 'Screens\UScreenOpen.pas', + UScreenTop5 in 'Screens\UScreenTop5.pas', + UScreenSongMenu in 'Screens\UScreenSongMenu.pas', + //PartyMode + UScreenSingModi in 'Screens\UScreenSingModi.pas', + UScreenPartyNewRound in 'Screens\UScreenPartyNewRound.pas', + UScreenPartyScore in 'Screens\UScreenPartyScore.pas', + UScreenPartyPlayer in 'Screens\UScreenPartyPlayer.pas', + UScreenPartyOptions in 'Screens\UScreenPartyOptions.pas', + UScreenPartyWin in 'Screens\UScreenPartyWin.pas', + + //Modi SDK + ModiSDK in '..\..\Modis\SDK\ModiSDK.pas'; + +const + Version = 'UltraStar Deluxe V 0.90 Beta'; + +var + WndTitle: string; + hWnd: THandle; + I: Integer; + +begin + WndTitle := Version; + + //Start more than One Time Prevention + hWnd:= FindWindow(nil, PChar(WndTitle)); + //Programm already started + if (hWnd <> 0) then + begin + I := Messagebox(0, PChar('Another Instance of Ultrastar is already running. Contėnue ?'), PChar(WndTitle), MB_ICONWARNING or MB_YESNO); + if (I = IDYes) then + begin + I := 1; + repeat + Inc(I); + hWnd := FindWindow(nil, PChar(WndTitle + ' Instance ' + InttoStr(I))); + until (hWnd = 0); + + WndTitle := WndTitle + ' Instance ' + InttoStr(I); + end + else + Exit; + end; + + + + USTime := TTime.Create; + + // Log + Benchmark + Log := TLog.Create; + Log.Title := WndTitle; + Log.BenchmarkStart(0); +// Log.LogError(IntToStr(DayOfTheYear(Date))); + + // Language + Log.BenchmarkStart(1); + Log.LogStatus('Initialize Paths', 'Initialization'); InitializePaths; + Log.LogStatus('Load Language', 'Initialization'); Language := TLanguage.Create; + //Add Const Values: + Language.AddConst('US_VERSION', Version); + Log.BenchmarkEnd(1); + Log.LogBenchmark('Loading Language', 1); + + // SDL + Log.BenchmarkStart(1); + Log.LogStatus('Initialize SDL', 'Initialization'); + SDL_Init(SDL_INIT_VIDEO or SDL_INIT_AUDIO); + Log.BenchmarkEnd(1); + Log.LogBenchmark('Initializing SDL', 1); + + // Skin + Log.BenchmarkStart(1); + Log.LogStatus('Loading Skin List', 'Initialization'); Skin := TSkin.Create; + Log.BenchmarkEnd(1); + Log.LogBenchmark('Loading Skin List', 1); + + //Log.LogBenchmark(inttostr(Skin.), 1); + + // Sound Card List + Log.BenchmarkStart(1); + Log.LogStatus('Loading Soundcard list', 'Initialization'); + Recording := TRecord.Create; + Log.BenchmarkEnd(1); + Log.LogBenchmark('Loading Soundcard list', 1); + + // Ini + Paths + Log.BenchmarkStart(1); + Log.LogStatus('Load Ini', 'Initialization'); Ini := TIni.Create; + Ini.Load; + Language.ChangeLanguage(ILanguage[Ini.Language]); + Log.BenchmarkEnd(1); + Log.LogBenchmark('Loading Ini', 1); + + // LCD + Log.BenchmarkStart(1); + Log.LogStatus('Load LCD', 'Initialization'); LCD := TLCD.Create; + if Ini.LPT = 1 then begin +// LCD.HalfInterface := true; + LCD.Enable; + LCD.Clear; + LCD.WriteText(1, ' UltraStar '); + LCD.WriteText(2, ' Loading... '); + end; + Log.BenchmarkEnd(1); + Log.LogBenchmark('Loading LCD', 1); + + // Light + Log.BenchmarkStart(1); + Log.LogStatus('Load Light', 'Initialization'); Light := TLight.Create; + if Ini.LPT = 2 then begin + Light.Enable; +// Light.LightOne(0, 1000); + end; + Log.BenchmarkEnd(1); + Log.LogBenchmark('Loading Light', 1); + + // Theme + Log.BenchmarkStart(1); + Log.LogStatus('Load Themes', 'Initialization'); Theme := TTheme.Create('Themes\' + ITheme[Ini.Theme] + '.ini', Ini.Color); + Log.BenchmarkEnd(1); + Log.LogBenchmark('Loading Themes', 1); + + // Covers Cache + Log.BenchmarkStart(1); + Log.LogStatus('Creating Covers Cache', 'Initialization'); Covers := TCovers.Create; + Log.LogBenchmark('Loading Covers Cache Array', 1); + Log.BenchmarkStart(1); + + // Category Covers + Log.BenchmarkStart(1); + Log.LogStatus('Creating Category Covers Array', 'Initialization'); + CatCovers:= TCatCovers.Create; + Log.BenchmarkEnd(1); + Log.LogBenchmark('Loading Category Covers Array', 1); + + // Songs + //Log.BenchmarkStart(1); + Log.LogStatus('Creating Song Array', 'Initialization'); Songs := TSongs.Create; + Songs.LoadSongList; + Log.LogStatus('Creating 2nd Song Array', 'Initialization'); CatSongs := TCatSongs.Create; + Log.BenchmarkEnd(1); + Log.LogBenchmark('Loading Songs', 1); + + // PluginManager + Log.BenchmarkStart(1); + Log.LogStatus('PluginManager', 'Initialization'); + DLLMan := TDLLMan.Create; //Load PluginList + + Log.LogError(inttostr(Length(DLLMan.Plugins)) + ' Plugins Loaded'); + + Log.BenchmarkEnd(1); + Log.LogBenchmark('Loading PluginManager', 1); + + // Party Mode Manager + Log.BenchmarkStart(1); + Log.LogStatus('PartySession Manager', 'Initialization'); + PartySession := TParty_Session.Create; //Load PartySession + + Log.BenchmarkEnd(1); + Log.LogBenchmark('Loading PartySession Manager', 1); + + // Graphics + Log.BenchmarkStart(1); + Log.LogStatus('Initialize 3D', 'Initialization'); Initialize3D(WndTitle); + Log.BenchmarkEnd(1); + Log.LogBenchmark('Initializing 3D', 1); + + // Sound + Log.BenchmarkStart(1); + Log.LogStatus('Initialize Sound', 'Initialization'); + Log.LogStatus('Creating Music', 'InitializeSound'); Music := TMusic.Create; + InitializeSound; + Log.BenchmarkEnd(1); + Log.LogBenchmark('Initializing Sound', 1); + + // Score Saving System + Log.BenchmarkStart(1); + Log.LogStatus('Score DB System', 'Initialization'); + InitScore('Scores.db'); + Log.BenchmarkEnd(1); + Log.LogBenchmark('Loading Score DB System', 1); + + // Joypad + if Ini.Joypad = 1 then begin + Log.BenchmarkStart(1); + Log.LogStatus('Initialize Joystick', 'Initialization'); Joy := TJoy.Create; + Log.BenchmarkEnd(1); + Log.LogBenchmark('Initializing Joystick', 1); + end; + + Log.BenchmarkEnd(0); + Log.LogBenchmark('Loading Time', 0); + + +// Music.SetLoop(true); +// Music.SetVolume(50); +// Music.Open(SkinPath + 'Menu Music 3.mp3'); +// Music.Play; + Log.LogStatus('Main Loop', 'Initialization'); MainLoop; + +// sleep(3000); + + // finish + if Ini.LPT = 1 then LCD.Clear; + if Ini.LPT = 2 then Light.TurnOff; + + Log.Free; +end. \ No newline at end of file -- cgit v1.2.3 From a48be5b4dd13db5cbc2cce4932508e61ff354340 Mon Sep 17 00:00:00 2001 From: mogguh Date: Wed, 21 Mar 2007 21:35:49 +0000 Subject: Golden notes are implemented from now on. So "golden notes" twinkle, and perfect sung notes twinkle too. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@12 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index 5c598eda..b0d49610 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -258,6 +258,13 @@ begin Log.BenchmarkEnd(1); Log.LogBenchmark('Loading Score DB System', 1); + //GoldenStarsTwinkleMod + Log.BenchmarkStart(1); + Log.LogStatus('GoldenStars', 'Initialization'); + GoldenRec := TEffectManager.Create; + Log.BenchmarkEnd(1); + Log.LogBenchmark('Loading GoldenStars', 1); + // Joypad if Ini.Joypad = 1 then begin Log.BenchmarkStart(1); -- cgit v1.2.3 From c33620b856f5106ba95638106c5a55ff88e5290c Mon Sep 17 00:00:00 2001 From: whiteshark0 Date: Thu, 22 Mar 2007 19:59:00 +0000 Subject: Fixed Bug: No BG in Party Mode and little Code clean up git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@16 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 76 +++++++++++++++++++++++++++---------------------- 1 file changed, 42 insertions(+), 34 deletions(-) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index b0d49610..1bc19dcf 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -6,16 +6,9 @@ {$R 'UltraStar.res' 'UltraStar.rc'} uses - {//Earlyer in Code Dir.. Now in SearchDir - DDKint in '..\ZLPortIO\ddkint.pas', - ZLPortIO in '..\ZLPortIO\zlportio.pas', - SQLiteTable3 in '..\SQLite\SQLiteTable3.pas', - SQLite3 in '..\SQLite\SQLite3.pas',} - Windows, - SDL, - SysUtils, - - //Menu Objects + //------------------------------ + //Includes - Menu System + //------------------------------ UDisplay in 'Menu\UDisplay.pas', UMenu in 'Menu\UMenu.pas', UMenuStatic in 'Menu\UMenuStatic.pas', @@ -26,11 +19,14 @@ uses UMenuSelectSlide in 'Menu\UMenuSelectSlide.pas', UDrawTexture in 'Menu\UDrawTexture.pas', - //Classes + //------------------------------ + //Includes - Classes + //------------------------------ UGraphic in 'Classes\UGraphic.pas', UTexture in 'Classes\UTexture.pas', UMusic in 'Classes\UMusic.pas', UPliki in 'Classes\UPliki.pas', + ULanguage in 'Classes\ULanguage.pas', UMain in 'Classes\UMain.pas', UDraw in 'Classes\UDraw.pas', URecord in 'Classes\URecord.pas', @@ -47,7 +43,6 @@ uses ULCD in 'Classes\ULCD.pas', ULight in 'Classes\ULight.pas', UScores in 'Classes\UScores.pas', - ULanguage in 'Classes\ULanguage.pas', UCovers in 'Classes\UCovers.pas', UCatCovers in 'Classes\UCatCovers.pas', UFiles in 'Classes\UFiles.pas', @@ -55,7 +50,9 @@ uses UDLLManager in 'Classes\UDLLManager.pas', UParty in 'Classes\UParty.pas', - //Screens + //------------------------------ + //Includes - Screens + //------------------------------ UScreenLoading in 'Screens\UScreenLoading.pas', UScreenWelcome in 'Screens\UScreenWelcome.pas', UScreenMain in 'Screens\UScreenMain.pas', @@ -78,7 +75,10 @@ uses UScreenOpen in 'Screens\UScreenOpen.pas', UScreenTop5 in 'Screens\UScreenTop5.pas', UScreenSongMenu in 'Screens\UScreenSongMenu.pas', - //PartyMode + + //------------------------------ + //Includes - Screens PartyMode + //------------------------------ UScreenSingModi in 'Screens\UScreenSingModi.pas', UScreenPartyNewRound in 'Screens\UScreenPartyNewRound.pas', UScreenPartyScore in 'Screens\UScreenPartyScore.pas', @@ -86,8 +86,17 @@ uses UScreenPartyOptions in 'Screens\UScreenPartyOptions.pas', UScreenPartyWin in 'Screens\UScreenPartyWin.pas', - //Modi SDK - ModiSDK in '..\..\Modis\SDK\ModiSDK.pas'; + //------------------------------ + //Includes - Modi SDK + //------------------------------ + ModiSDK in '..\..\Modis\SDK\ModiSDK.pas', + + //------------------------------ + //Includes - Delphi + //------------------------------ + Windows, + SDL, + SysUtils; const Version = 'UltraStar Deluxe V 0.90 Beta'; @@ -100,7 +109,9 @@ var begin WndTitle := Version; + //------------------------------ //Start more than One Time Prevention + //------------------------------ hWnd:= FindWindow(nil, PChar(WndTitle)); //Programm already started if (hWnd <> 0) then @@ -120,15 +131,15 @@ begin Exit; end; - - + //------------------------------ + //StartUp - Create Classes and Load Files + //------------------------------ USTime := TTime.Create; // Log + Benchmark Log := TLog.Create; Log.Title := WndTitle; Log.BenchmarkStart(0); -// Log.LogError(IntToStr(DayOfTheYear(Date))); // Language Log.BenchmarkStart(1); @@ -152,8 +163,6 @@ begin Log.BenchmarkEnd(1); Log.LogBenchmark('Loading Skin List', 1); - //Log.LogBenchmark(inttostr(Skin.), 1); - // Sound Card List Log.BenchmarkStart(1); Log.LogStatus('Loading Soundcard list', 'Initialization'); @@ -187,7 +196,6 @@ begin Log.LogStatus('Load Light', 'Initialization'); Light := TLight.Create; if Ini.LPT = 2 then begin Light.Enable; -// Light.LightOne(0, 1000); end; Log.BenchmarkEnd(1); Log.LogBenchmark('Loading Light', 1); @@ -223,9 +231,6 @@ begin Log.BenchmarkStart(1); Log.LogStatus('PluginManager', 'Initialization'); DLLMan := TDLLMan.Create; //Load PluginList - - Log.LogError(inttostr(Length(DLLMan.Plugins)) + ' Plugins Loaded'); - Log.BenchmarkEnd(1); Log.LogBenchmark('Loading PluginManager', 1); @@ -260,10 +265,10 @@ begin //GoldenStarsTwinkleMod Log.BenchmarkStart(1); - Log.LogStatus('GoldenStars', 'Initialization'); + Log.LogStatus('Effect Manager', 'Initialization'); GoldenRec := TEffectManager.Create; Log.BenchmarkEnd(1); - Log.LogBenchmark('Loading GoldenStars', 1); + Log.LogBenchmark('Loading Particel System', 1); // Joypad if Ini.Joypad = 1 then begin @@ -277,15 +282,18 @@ begin Log.LogBenchmark('Loading Time', 0); -// Music.SetLoop(true); -// Music.SetVolume(50); -// Music.Open(SkinPath + 'Menu Music 3.mp3'); -// Music.Play; + //------------------------------ + //Start- Mainloop + //------------------------------ + //Music.SetLoop(true); + //Music.SetVolume(50); + //Music.Open(SkinPath + 'Menu Music 3.mp3'); + //Music.Play; Log.LogStatus('Main Loop', 'Initialization'); MainLoop; -// sleep(3000); - - // finish + //------------------------------ + //Finish Application + //------------------------------ if Ini.LPT = 1 then LCD.Clear; if Ini.LPT = 2 then Light.TurnOff; -- cgit v1.2.3 From 95dc3d90b3eb11080fdcd5edae37cbd35c4ffb57 Mon Sep 17 00:00:00 2001 From: whiteshark0 Date: Fri, 23 Mar 2007 17:40:06 +0000 Subject: Some Changes on Database System and Header Reader Fixed Bug: Scores with 0 are added to DB Made a Class instead of many Functions Fixed a Bug in UFiles, not reading Gap from Header correctly git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@20 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index 1bc19dcf..408405f8 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -42,7 +42,7 @@ uses UJoystick in 'Classes\UJoystick.pas', ULCD in 'Classes\ULCD.pas', ULight in 'Classes\ULight.pas', - UScores in 'Classes\UScores.pas', + UDataBase in 'Classes\UDataBase.pas', UCovers in 'Classes\UCovers.pas', UCatCovers in 'Classes\UCatCovers.pas', UFiles in 'Classes\UFiles.pas', @@ -258,10 +258,11 @@ begin // Score Saving System Log.BenchmarkStart(1); - Log.LogStatus('Score DB System', 'Initialization'); - InitScore('Scores.db'); + Log.LogStatus('DataBase System', 'Initialization'); + DataBase := TDataBaseSystem.Create; + DataBase.Init ('Ultrastar.db'); Log.BenchmarkEnd(1); - Log.LogBenchmark('Loading Score DB System', 1); + Log.LogBenchmark('Loading DataBase System', 1); //GoldenStarsTwinkleMod Log.BenchmarkStart(1); -- cgit v1.2.3 From 7c809200754d707f440ec45686692db405da8ae1 Mon Sep 17 00:00:00 2001 From: whiteshark0 Date: Sat, 24 Mar 2007 12:23:00 +0000 Subject: Fixed Bug: Not translating Texts reading Theme.Ini Compiler doesn't define CompilerConst Translate correctly. Fixed by Commenting IFDEF Operations out git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@21 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index 408405f8..9b73883a 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -1,4 +1,4 @@ - program UltraStar; +program UltraStar; {$DEFINE TRANSLATE} //DEFINE THEMESAVE} -- cgit v1.2.3 From 3ba33f8e920a9e9a3114f159e2b6fda4273a6efb Mon Sep 17 00:00:00 2001 From: whiteshark0 Date: Wed, 28 Mar 2007 13:08:41 +0000 Subject: Added Jumpto Ability to SongScreen (Press J) Fixed: Golden Notes are not shown in PartyMode git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@39 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 1 + 1 file changed, 1 insertion(+) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index 9b73883a..65a01257 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -75,6 +75,7 @@ uses UScreenOpen in 'Screens\UScreenOpen.pas', UScreenTop5 in 'Screens\UScreenTop5.pas', UScreenSongMenu in 'Screens\UScreenSongMenu.pas', + UScreenSongJumpto in 'Screens\UScreenSongJumpto.pas', //------------------------------ //Includes - Screens PartyMode -- cgit v1.2.3 From e2cd03822f28a4866f98fb0893a73b02bd60ce03 Mon Sep 17 00:00:00 2001 From: whiteshark0 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/UltraStar.dpr | 33 +++++++++------------------------ 1 file changed, 9 insertions(+), 24 deletions(-) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index 65a01257..66638832 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -6,9 +6,6 @@ program UltraStar; {$R 'UltraStar.res' 'UltraStar.rc'} uses - //------------------------------ - //Includes - Menu System - //------------------------------ UDisplay in 'Menu\UDisplay.pas', UMenu in 'Menu\UMenu.pas', UMenuStatic in 'Menu\UMenuStatic.pas', @@ -18,10 +15,6 @@ uses UMenuSelect in 'Menu\UMenuSelect.pas', UMenuSelectSlide in 'Menu\UMenuSelectSlide.pas', UDrawTexture in 'Menu\UDrawTexture.pas', - - //------------------------------ - //Includes - Classes - //------------------------------ UGraphic in 'Classes\UGraphic.pas', UTexture in 'Classes\UTexture.pas', UMusic in 'Classes\UMusic.pas', @@ -49,10 +42,6 @@ uses UGraphicClasses in 'Classes\UGraphicClasses.pas', UDLLManager in 'Classes\UDLLManager.pas', UParty in 'Classes\UParty.pas', - - //------------------------------ - //Includes - Screens - //------------------------------ UScreenLoading in 'Screens\UScreenLoading.pas', UScreenWelcome in 'Screens\UScreenWelcome.pas', UScreenMain in 'Screens\UScreenMain.pas', @@ -76,28 +65,17 @@ uses UScreenTop5 in 'Screens\UScreenTop5.pas', UScreenSongMenu in 'Screens\UScreenSongMenu.pas', UScreenSongJumpto in 'Screens\UScreenSongJumpto.pas', - - //------------------------------ - //Includes - Screens PartyMode - //------------------------------ UScreenSingModi in 'Screens\UScreenSingModi.pas', UScreenPartyNewRound in 'Screens\UScreenPartyNewRound.pas', UScreenPartyScore in 'Screens\UScreenPartyScore.pas', UScreenPartyPlayer in 'Screens\UScreenPartyPlayer.pas', UScreenPartyOptions in 'Screens\UScreenPartyOptions.pas', UScreenPartyWin in 'Screens\UScreenPartyWin.pas', - - //------------------------------ - //Includes - Modi SDK - //------------------------------ ModiSDK in '..\..\Modis\SDK\ModiSDK.pas', - - //------------------------------ - //Includes - Delphi - //------------------------------ Windows, SDL, - SysUtils; + SysUtils, + UPlaylist in 'Classes\UPlaylist.pas'; const Version = 'UltraStar Deluxe V 0.90 Beta'; @@ -265,6 +243,13 @@ begin Log.BenchmarkEnd(1); Log.LogBenchmark('Loading DataBase System', 1); + //Playlist Manager + Log.BenchmarkStart(1); + Log.LogStatus('Playlist Manager', 'Initialization'); + PlaylistMan := TPlaylistManager.Create; + Log.BenchmarkEnd(1); + Log.LogBenchmark('Loading Playlist Manager', 1); + //GoldenStarsTwinkleMod Log.BenchmarkStart(1); Log.LogStatus('Effect Manager', 'Initialization'); -- cgit v1.2.3 From 9d01c8801db29d6ff3d64ef81b84321549d84688 Mon Sep 17 00:00:00 2001 From: whiteshark0 Date: Thu, 5 Apr 2007 21:09:52 +0000 Subject: Added Advanced Screen and Options in TIni Options working now only for Effect Perfect and Effect Golden. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@65 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index 66638832..f36f9a26 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -6,6 +6,9 @@ program UltraStar; {$R 'UltraStar.res' 'UltraStar.rc'} uses + //------------------------------ + //Includes - Menu System + //------------------------------ UDisplay in 'Menu\UDisplay.pas', UMenu in 'Menu\UMenu.pas', UMenuStatic in 'Menu\UMenuStatic.pas', @@ -15,6 +18,10 @@ uses UMenuSelect in 'Menu\UMenuSelect.pas', UMenuSelectSlide in 'Menu\UMenuSelectSlide.pas', UDrawTexture in 'Menu\UDrawTexture.pas', + + //------------------------------ + //Includes - Classes + //------------------------------ UGraphic in 'Classes\UGraphic.pas', UTexture in 'Classes\UTexture.pas', UMusic in 'Classes\UMusic.pas', @@ -42,6 +49,11 @@ uses UGraphicClasses in 'Classes\UGraphicClasses.pas', UDLLManager in 'Classes\UDLLManager.pas', UParty in 'Classes\UParty.pas', + UPlaylist in 'Classes\UPlaylist.pas', + + //------------------------------ + //Includes - Screens + //------------------------------ UScreenLoading in 'Screens\UScreenLoading.pas', UScreenWelcome in 'Screens\UScreenWelcome.pas', UScreenMain in 'Screens\UScreenMain.pas', @@ -57,6 +69,7 @@ uses UScreenOptionsLyrics in 'Screens\UScreenOptionsLyrics.pas', UScreenOptionsThemes in 'Screens\UScreenOptionsThemes.pas', UScreenOptionsRecord in 'Screens\UScreenOptionsRecord.pas', + UScreenOptionsAdvanced in 'Screens\UScreenOptionsAdvanced.pas', UScreenEditSub in 'Screens\UScreenEditSub.pas', UScreenEdit in 'Screens\UScreenEdit.pas', UScreenEditConvert in 'Screens\UScreenEditConvert.pas', @@ -65,17 +78,29 @@ uses UScreenTop5 in 'Screens\UScreenTop5.pas', UScreenSongMenu in 'Screens\UScreenSongMenu.pas', UScreenSongJumpto in 'Screens\UScreenSongJumpto.pas', + + //------------------------------ + //Includes - Screens PartyMode + //------------------------------ UScreenSingModi in 'Screens\UScreenSingModi.pas', UScreenPartyNewRound in 'Screens\UScreenPartyNewRound.pas', UScreenPartyScore in 'Screens\UScreenPartyScore.pas', UScreenPartyPlayer in 'Screens\UScreenPartyPlayer.pas', UScreenPartyOptions in 'Screens\UScreenPartyOptions.pas', UScreenPartyWin in 'Screens\UScreenPartyWin.pas', + + //------------------------------ + //Includes - Modi SDK + //------------------------------ ModiSDK in '..\..\Modis\SDK\ModiSDK.pas', + + //------------------------------ + //Includes - Delphi + //------------------------------ Windows, SDL, - SysUtils, - UPlaylist in 'Classes\UPlaylist.pas'; + SysUtils; + const Version = 'UltraStar Deluxe V 0.90 Beta'; -- cgit v1.2.3 From e6917faa19aebfa6d089b24c65e4c7fe4bd6b503 Mon Sep 17 00:00:00 2001 From: whiteshark0 Date: Fri, 13 Apr 2007 11:25:13 +0000 Subject: Added Reflection to ThemeStatic Added Attribut ReflectionSpacing git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@83 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index f36f9a26..fc1fa8a2 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -103,7 +103,7 @@ uses const - Version = 'UltraStar Deluxe V 0.90 Beta'; + Version = 'UltraStar Deluxe V 0.95 Beta'; var WndTitle: string; -- cgit v1.2.3 From 6cdcfb402ce738dfc77b008fcb98fd1cda691eb5 Mon Sep 17 00:00:00 2001 From: whiteshark0 Date: Thu, 19 Apr 2007 18:53:22 +0000 Subject: Added Statistic Screens to C0de and to Theme Moved some Translated Strings from UScreenPartyOptions to UTheme to use it with the Statistic Screens, too. Fixed use of /n Tag istead of the correct \n git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@118 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index fc1fa8a2..d5418e04 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -78,6 +78,8 @@ uses UScreenTop5 in 'Screens\UScreenTop5.pas', UScreenSongMenu in 'Screens\UScreenSongMenu.pas', UScreenSongJumpto in 'Screens\UScreenSongJumpto.pas', + UScreenStatMain in 'Screens\UScreenStatMain.pas', + UScreenStatDetail in 'Screens\UScreenStatDetail.pas', //------------------------------ //Includes - Screens PartyMode @@ -103,7 +105,7 @@ uses const - Version = 'UltraStar Deluxe V 0.95 Beta'; + Version = 'UltraStar Deluxe V 0.96 Beta'; var WndTitle: string; -- cgit v1.2.3 From e3ec6fbc344c9af26b80932d3a29fb4bf1f6c9a2 Mon Sep 17 00:00:00 2001 From: mogguh Date: Thu, 26 Apr 2007 00:11:39 +0000 Subject: Feature: Credits screen is now a screen for itself (UGraphic.pas, UScreenMain.pas, UScreenCredits.pas) Feature: Credits screen now has a tune in the background, thanks weezl <3 !! (place the mp3 into your "Sounds" path) git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@141 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index d5418e04..0db37635 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -6,9 +6,6 @@ program UltraStar; {$R 'UltraStar.res' 'UltraStar.rc'} uses - //------------------------------ - //Includes - Menu System - //------------------------------ UDisplay in 'Menu\UDisplay.pas', UMenu in 'Menu\UMenu.pas', UMenuStatic in 'Menu\UMenuStatic.pas', @@ -18,10 +15,6 @@ uses UMenuSelect in 'Menu\UMenuSelect.pas', UMenuSelectSlide in 'Menu\UMenuSelectSlide.pas', UDrawTexture in 'Menu\UDrawTexture.pas', - - //------------------------------ - //Includes - Classes - //------------------------------ UGraphic in 'Classes\UGraphic.pas', UTexture in 'Classes\UTexture.pas', UMusic in 'Classes\UMusic.pas', @@ -50,10 +43,6 @@ uses UDLLManager in 'Classes\UDLLManager.pas', UParty in 'Classes\UParty.pas', UPlaylist in 'Classes\UPlaylist.pas', - - //------------------------------ - //Includes - Screens - //------------------------------ UScreenLoading in 'Screens\UScreenLoading.pas', UScreenWelcome in 'Screens\UScreenWelcome.pas', UScreenMain in 'Screens\UScreenMain.pas', @@ -80,30 +69,18 @@ uses UScreenSongJumpto in 'Screens\UScreenSongJumpto.pas', UScreenStatMain in 'Screens\UScreenStatMain.pas', UScreenStatDetail in 'Screens\UScreenStatDetail.pas', - - //------------------------------ - //Includes - Screens PartyMode - //------------------------------ UScreenSingModi in 'Screens\UScreenSingModi.pas', UScreenPartyNewRound in 'Screens\UScreenPartyNewRound.pas', UScreenPartyScore in 'Screens\UScreenPartyScore.pas', UScreenPartyPlayer in 'Screens\UScreenPartyPlayer.pas', UScreenPartyOptions in 'Screens\UScreenPartyOptions.pas', UScreenPartyWin in 'Screens\UScreenPartyWin.pas', - - //------------------------------ - //Includes - Modi SDK - //------------------------------ ModiSDK in '..\..\Modis\SDK\ModiSDK.pas', - - //------------------------------ - //Includes - Delphi - //------------------------------ + UScreenCredits in 'Screens\UScreenCredits.pas', Windows, SDL, SysUtils; - const Version = 'UltraStar Deluxe V 0.96 Beta'; -- cgit v1.2.3 From bda4fa8e57ca63a1d591433f120b4226d6a5d327 Mon Sep 17 00:00:00 2001 From: whiteshark0 Date: Sun, 29 Apr 2007 17:50:29 +0000 Subject: Added 2 new Buttons to ScreenMain: Multi and Stats Updated Language Fiels to Fit with new Buttons Some CodeClean Up in Menu Class and in Screens Some minor Bug fixes I forgot about Added ability to group Buttons within a Screen New Theme Object: ButtonCollection: Same Attributes as a Button Plus FirstChild: Defining the First Button in the Group. For Example: SingSolo is 1, SingMulti Button is 2, in ScreenMain Added Attribute to Theme Button: Parent: Number of the assigned Group, 0 for no Group Used new Abilitys in MainScreen git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@149 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index 0db37635..b7466d84 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -6,6 +6,9 @@ program UltraStar; {$R 'UltraStar.res' 'UltraStar.rc'} uses + //------------------------------ + //Includes - Menu System + //------------------------------ UDisplay in 'Menu\UDisplay.pas', UMenu in 'Menu\UMenu.pas', UMenuStatic in 'Menu\UMenuStatic.pas', @@ -15,6 +18,11 @@ uses UMenuSelect in 'Menu\UMenuSelect.pas', UMenuSelectSlide in 'Menu\UMenuSelectSlide.pas', UDrawTexture in 'Menu\UDrawTexture.pas', + UMenuButtonCollection in 'Menu\UMenuButtonCollection.pas', + + //------------------------------ + //Includes - Classes + //------------------------------ UGraphic in 'Classes\UGraphic.pas', UTexture in 'Classes\UTexture.pas', UMusic in 'Classes\UMusic.pas', @@ -43,6 +51,10 @@ uses UDLLManager in 'Classes\UDLLManager.pas', UParty in 'Classes\UParty.pas', UPlaylist in 'Classes\UPlaylist.pas', + + //------------------------------ + //Includes - Screens + //------------------------------ UScreenLoading in 'Screens\UScreenLoading.pas', UScreenWelcome in 'Screens\UScreenWelcome.pas', UScreenMain in 'Screens\UScreenMain.pas', @@ -69,14 +81,26 @@ uses UScreenSongJumpto in 'Screens\UScreenSongJumpto.pas', UScreenStatMain in 'Screens\UScreenStatMain.pas', UScreenStatDetail in 'Screens\UScreenStatDetail.pas', + UScreenCredits in 'Screens\UScreenCredits.pas', + + //------------------------------ + //Includes - Screens PartyMode + //------------------------------ UScreenSingModi in 'Screens\UScreenSingModi.pas', UScreenPartyNewRound in 'Screens\UScreenPartyNewRound.pas', UScreenPartyScore in 'Screens\UScreenPartyScore.pas', UScreenPartyPlayer in 'Screens\UScreenPartyPlayer.pas', UScreenPartyOptions in 'Screens\UScreenPartyOptions.pas', UScreenPartyWin in 'Screens\UScreenPartyWin.pas', + + //------------------------------ + //Includes - Modi SDK + //------------------------------ ModiSDK in '..\..\Modis\SDK\ModiSDK.pas', - UScreenCredits in 'Screens\UScreenCredits.pas', + + //------------------------------ + //Includes - Delphi + //------------------------------ Windows, SDL, SysUtils; -- cgit v1.2.3 From 5bf0ebf274fef28811ab952338bd261bd1dd0fa8 Mon Sep 17 00:00:00 2001 From: b1indy Date: Thu, 3 May 2007 00:19:52 +0000 Subject: added "popups" to ask for confirmation when leaving party mode or game or to display messages (like minor errors) still ugly, needs some theme work git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@157 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index b7466d84..5f19c1d4 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -82,6 +82,7 @@ uses UScreenStatMain in 'Screens\UScreenStatMain.pas', UScreenStatDetail in 'Screens\UScreenStatDetail.pas', UScreenCredits in 'Screens\UScreenCredits.pas', + UScreenPopup in 'Screens\UScreenPopup.pas', //------------------------------ //Includes - Screens PartyMode @@ -313,4 +314,4 @@ begin if Ini.LPT = 2 then Light.TurnOff; Log.Free; -end. \ No newline at end of file +end. -- cgit v1.2.3 From 4a731514163a14bd3a9222d99707880b56772663 Mon Sep 17 00:00:00 2001 From: whiteshark0 Date: Wed, 16 May 2007 19:19:35 +0000 Subject: all SongFile Loading and Saving procedures moved to UFiles. Added Some Tolerance in Song File Loading and Song Header Loading. Fix: Programm doesn't Crash anymore when a coruppted Song is loaded for Singing or Editing. Now Jump back to SongScreen and show an Error Message. Also Party Mode is not Interupted, a new Song will be selected automatically. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@197 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index 5f19c1d4..b9687292 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -26,7 +26,7 @@ uses UGraphic in 'Classes\UGraphic.pas', UTexture in 'Classes\UTexture.pas', UMusic in 'Classes\UMusic.pas', - UPliki in 'Classes\UPliki.pas', + //UPliki in 'Classes\UPliki.pas', ULanguage in 'Classes\ULanguage.pas', UMain in 'Classes\UMain.pas', UDraw in 'Classes\UDraw.pas', @@ -107,7 +107,7 @@ uses SysUtils; const - Version = 'UltraStar Deluxe V 0.96 Beta'; + Version = 'UltraStar Deluxe V 0.98 Beta'; var WndTitle: string; -- cgit v1.2.3 From dd3cc6f8e84f03f626a88741474412d36e4d18ac Mon Sep 17 00:00:00 2001 From: whiteshark0 Date: Sun, 8 Jul 2007 12:00:15 +0000 Subject: Improved Error Logging and Benchmark: Write US Version, date and time to files. Added better Commandline Parameter Interpreter: More than one parameter can be used at the same time Many new, useful farameters: e.g. No error logging, Resolution change, FullScreen, DualScreen Mode, other Config File, other Score File and SongPath git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@274 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index b9687292..44899166 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -1,7 +1,6 @@ program UltraStar; {$DEFINE TRANSLATE} -//DEFINE THEMESAVE} {$R 'UltraStar.res' 'UltraStar.rc'} @@ -26,7 +25,6 @@ uses UGraphic in 'Classes\UGraphic.pas', UTexture in 'Classes\UTexture.pas', UMusic in 'Classes\UMusic.pas', - //UPliki in 'Classes\UPliki.pas', ULanguage in 'Classes\ULanguage.pas', UMain in 'Classes\UMain.pas', UDraw in 'Classes\UDraw.pas', @@ -51,6 +49,7 @@ uses UDLLManager in 'Classes\UDLLManager.pas', UParty in 'Classes\UParty.pas', UPlaylist in 'Classes\UPlaylist.pas', + UCommandLine in 'Classes\UCommandLine.pas', //------------------------------ //Includes - Screens @@ -144,9 +143,13 @@ begin //------------------------------ USTime := TTime.Create; + // Commandline Parameter Parser + Params := TCMDParams.Create; + // Log + Benchmark Log := TLog.Create; Log.Title := WndTitle; + Log.Enabled := Not Params.NoLog; Log.BenchmarkStart(0); // Language @@ -182,7 +185,13 @@ begin Log.BenchmarkStart(1); Log.LogStatus('Load Ini', 'Initialization'); Ini := TIni.Create; Ini.Load; - Language.ChangeLanguage(ILanguage[Ini.Language]); + + //Load Languagefile + if (Params.Language <> -1) then + Language.ChangeLanguage(ILanguage[Params.Language]) + else + Language.ChangeLanguage(ILanguage[Ini.Language]); + Log.BenchmarkEnd(1); Log.LogBenchmark('Loading Ini', 1); @@ -268,7 +277,12 @@ begin Log.BenchmarkStart(1); Log.LogStatus('DataBase System', 'Initialization'); DataBase := TDataBaseSystem.Create; - DataBase.Init ('Ultrastar.db'); + + if (Params.ScoreFile = '') then + DataBase.Init ('Ultrastar.db') + else + DataBase.Init (Params.ScoreFile); + Log.BenchmarkEnd(1); Log.LogBenchmark('Loading DataBase System', 1); @@ -287,7 +301,7 @@ begin Log.LogBenchmark('Loading Particel System', 1); // Joypad - if Ini.Joypad = 1 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); -- cgit v1.2.3 From f6a236acf6289b452e651107c9ca8cf9c6e82e41 Mon Sep 17 00:00:00 2001 From: whiteshark0 Date: Sun, 8 Jul 2007 14:09:29 +0000 Subject: Changed to Version 1.00 RC1 Only changes that have to be done from now on are changes in the Theme Files. I hope Mota will be able to do it soon git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@281 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index 44899166..a49d43c2 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -106,7 +106,7 @@ uses SysUtils; const - Version = 'UltraStar Deluxe V 0.98 Beta'; + Version = 'UltraStar Deluxe V 1.00 RC1'; var WndTitle: string; -- cgit v1.2.3 From b7f377e62a7e941d7898c187a63dd6ed99b0798f Mon Sep 17 00:00:00 2001 From: b1indy Date: Sat, 28 Jul 2007 13:29:32 +0000 Subject: experimental ffmpeg videodecoding support, frameskipping doesn't work quite right yet git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@332 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 28 +++------------------------- 1 file changed, 3 insertions(+), 25 deletions(-) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index a49d43c2..e523e98e 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -5,9 +5,6 @@ program UltraStar; {$R 'UltraStar.res' 'UltraStar.rc'} uses - //------------------------------ - //Includes - Menu System - //------------------------------ UDisplay in 'Menu\UDisplay.pas', UMenu in 'Menu\UMenu.pas', UMenuStatic in 'Menu\UMenuStatic.pas', @@ -18,10 +15,6 @@ uses UMenuSelectSlide in 'Menu\UMenuSelectSlide.pas', UDrawTexture in 'Menu\UDrawTexture.pas', UMenuButtonCollection in 'Menu\UMenuButtonCollection.pas', - - //------------------------------ - //Includes - Classes - //------------------------------ UGraphic in 'Classes\UGraphic.pas', UTexture in 'Classes\UTexture.pas', UMusic in 'Classes\UMusic.pas', @@ -49,11 +42,7 @@ uses UDLLManager in 'Classes\UDLLManager.pas', UParty in 'Classes\UParty.pas', UPlaylist in 'Classes\UPlaylist.pas', - UCommandLine in 'Classes\UCommandLine.pas', - - //------------------------------ - //Includes - Screens - //------------------------------ + UCommandLine in 'Classes\UCommandLine.pas', UScreenLoading in 'Screens\UScreenLoading.pas', UScreenWelcome in 'Screens\UScreenWelcome.pas', UScreenMain in 'Screens\UScreenMain.pas', @@ -82,28 +71,17 @@ uses UScreenStatDetail in 'Screens\UScreenStatDetail.pas', UScreenCredits in 'Screens\UScreenCredits.pas', UScreenPopup in 'Screens\UScreenPopup.pas', - - //------------------------------ - //Includes - Screens PartyMode - //------------------------------ UScreenSingModi in 'Screens\UScreenSingModi.pas', UScreenPartyNewRound in 'Screens\UScreenPartyNewRound.pas', UScreenPartyScore in 'Screens\UScreenPartyScore.pas', UScreenPartyPlayer in 'Screens\UScreenPartyPlayer.pas', UScreenPartyOptions in 'Screens\UScreenPartyOptions.pas', UScreenPartyWin in 'Screens\UScreenPartyWin.pas', - - //------------------------------ - //Includes - Modi SDK - //------------------------------ ModiSDK in '..\..\Modis\SDK\ModiSDK.pas', - - //------------------------------ - //Includes - Delphi - //------------------------------ Windows, SDL, - SysUtils; + SysUtils, + Uffmpeg in 'SMpeg\Uffmpeg.pas'; const Version = 'UltraStar Deluxe V 1.00 RC1'; -- cgit v1.2.3 From bf62fe40a0986e0791eb462ef5adebf079e744e6 Mon Sep 17 00:00:00 2001 From: whiteshark0 Date: Sun, 2 Sep 2007 14:31:51 +0000 Subject: Some Cleanup in URecord Some Cleanup in UMusic Some Cleanup in ProjectFile Upgrade from Bass 2.1 to Bass 2.3 git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@361 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index e523e98e..08f41cba 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -5,6 +5,9 @@ program UltraStar; {$R 'UltraStar.res' 'UltraStar.rc'} uses + //------------------------------ + //Includes - Menu System + //------------------------------ UDisplay in 'Menu\UDisplay.pas', UMenu in 'Menu\UMenu.pas', UMenuStatic in 'Menu\UMenuStatic.pas', @@ -15,6 +18,10 @@ uses UMenuSelectSlide in 'Menu\UMenuSelectSlide.pas', UDrawTexture in 'Menu\UDrawTexture.pas', UMenuButtonCollection in 'Menu\UMenuButtonCollection.pas', + + //------------------------------ + //Includes - Classes + //------------------------------ UGraphic in 'Classes\UGraphic.pas', UTexture in 'Classes\UTexture.pas', UMusic in 'Classes\UMusic.pas', @@ -26,7 +33,6 @@ uses TextGL in 'Classes\TextGL.pas', USongs in 'Classes\USongs.pas', UIni in 'Classes\UIni.pas', - USmpeg in 'SMpeg\USmpeg.pas', ULyrics in 'Classes\ULyrics.pas', USkins in 'Classes\USkins.pas', UThemes in 'Classes\UThemes.pas', @@ -42,7 +48,17 @@ uses UDLLManager in 'Classes\UDLLManager.pas', UParty in 'Classes\UParty.pas', UPlaylist in 'Classes\UPlaylist.pas', - UCommandLine in 'Classes\UCommandLine.pas', + UCommandLine in 'Classes\UCommandLine.pas', + + //------------------------------ + //Includes - Video Support + //------------------------------ + Uffmpeg in 'SMpeg\Uffmpeg.pas', + USmpeg in 'SMpeg\USmpeg.pas', + + //------------------------------ + //Includes - Screens + //------------------------------ UScreenLoading in 'Screens\UScreenLoading.pas', UScreenWelcome in 'Screens\UScreenWelcome.pas', UScreenMain in 'Screens\UScreenMain.pas', @@ -71,20 +87,31 @@ uses UScreenStatDetail in 'Screens\UScreenStatDetail.pas', UScreenCredits in 'Screens\UScreenCredits.pas', UScreenPopup in 'Screens\UScreenPopup.pas', + + //------------------------------ + //Includes - Screens PartyMode + //------------------------------ UScreenSingModi in 'Screens\UScreenSingModi.pas', UScreenPartyNewRound in 'Screens\UScreenPartyNewRound.pas', UScreenPartyScore in 'Screens\UScreenPartyScore.pas', UScreenPartyPlayer in 'Screens\UScreenPartyPlayer.pas', UScreenPartyOptions in 'Screens\UScreenPartyOptions.pas', UScreenPartyWin in 'Screens\UScreenPartyWin.pas', + + //------------------------------ + //Includes - Modi SDK + //------------------------------ ModiSDK in '..\..\Modis\SDK\ModiSDK.pas', + + //------------------------------ + //Includes - Delphi + //------------------------------ Windows, SDL, - SysUtils, - Uffmpeg in 'SMpeg\Uffmpeg.pas'; + SysUtils; const - Version = 'UltraStar Deluxe V 1.00 RC1'; + Version = 'UltraStar Deluxe V 1.10 Alpha Build'; var WndTitle: string; -- cgit v1.2.3 From 30343a531999b5e50673ee1731f1c54cbc008dfd Mon Sep 17 00:00:00 2001 From: jaybinks Date: Wed, 5 Sep 2007 12:02:06 +0000 Subject: added 3rd party dependencies ( except Jedi-SDL ) modified DPR to statically include all files needed (using relative paths) this means 3rd party components should not need installation in the IDE, or adding to search paths. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@368 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index 08f41cba..30c03e7e 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -5,6 +5,37 @@ program UltraStar; {$R 'UltraStar.res' 'UltraStar.rc'} uses + //------------------------------ + //Includes - 3rd Party Libraries + //------------------------------ + OpenGL12 in 'lib\JEDI-SDLv1.0\OpenGL\Pas\OpenGL12.pas', + smpeg in 'lib\JEDI-SDLv1.0\smpeg\Pas\smpeg.pas', + + bass in 'lib\bass\delphi\bass.pas', + + midiout in 'lib\midi\midiout.pas', + midiin in 'lib\midi\midiin.pas', + Circbuf in 'lib\midi\CIRCBUF.PAS', + MidiType in 'lib\midi\MidiType.PAS', + MidiDefs in 'lib\midi\MidiDefs.PAS', + MidiCons in 'lib\midi\MidiCons.PAS', + MidiFile in 'lib\midi\MidiFile.PAS', + Delphmcb in 'lib\midi\Delphmcb.PAS', + + zlportio in 'lib\zlportio\zlportio.pas', + ddkint in 'lib\zlportio\ddkint.pas', + + avcodec in 'lib\ffmpeg\avcodec.pas', + avformat in 'lib\ffmpeg\avformat.pas', + avutil in 'lib\ffmpeg\avutil.pas', + rational in 'lib\ffmpeg\rational.pas', + opt in 'lib\ffmpeg\opt.pas', + avio in 'lib\ffmpeg\avio.pas', + + SQLiteTable3 in 'lib\SQLite\SQLiteTable3.pas', + SQLite3 in 'lib\SQLite\SQLite3.pas', + + //------------------------------ //Includes - Menu System //------------------------------ -- cgit v1.2.3 From 247cbdca4eb8af228fa1753f1185e85077b5befa Mon Sep 17 00:00:00 2001 From: b1indy Date: Fri, 7 Sep 2007 21:09:02 +0000 Subject: UScreenSing.pas, UScreenSingModi.pas: removed Uffmpeg and USmpeg, added UVideo UGraphic.pas: prepared for possible loading animation UGraphicClasses.pas, ULCD.pas, ULight.pas, UMain.pas, USkins.pas, UDisplay.pas, UMenuButton.pas, UMenuSelect.pas, UMenuSelectSlide.pas, UMenuStatic.pas, UScreenCredits.pas, UScreenEditSub.pas, UScreenOpen.pas, UScreenPopup.pas: some fixes to get rid of some compiler infos/warnings git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@374 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index 30c03e7e..d39df45b 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -84,9 +84,8 @@ uses //------------------------------ //Includes - Video Support //------------------------------ - Uffmpeg in 'SMpeg\Uffmpeg.pas', - USmpeg in 'SMpeg\USmpeg.pas', - + UVideo in 'Classes\UVideo.pas', + //------------------------------ //Includes - Screens //------------------------------ -- cgit v1.2.3 From 486040f9b4cc080b7c02da4b286824ad86e26a93 Mon Sep 17 00:00:00 2001 From: b1indy Date: Fri, 7 Sep 2007 21:51:20 +0000 Subject: removed smpeg git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@376 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 1 - 1 file changed, 1 deletion(-) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index d39df45b..1cfa64f5 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -9,7 +9,6 @@ uses //Includes - 3rd Party Libraries //------------------------------ OpenGL12 in 'lib\JEDI-SDLv1.0\OpenGL\Pas\OpenGL12.pas', - smpeg in 'lib\JEDI-SDLv1.0\smpeg\Pas\smpeg.pas', bass in 'lib\bass\delphi\bass.pas', -- cgit v1.2.3 From 6e7b96ca3a7d47b0441bed904a9b8bb25c3223de Mon Sep 17 00:00:00 2001 From: jaybinks Date: Wed, 12 Sep 2007 12:43:38 +0000 Subject: * added missed dependency PNGImage. * moved FUNCTION InitializePaths(), from uFiles to uMain as this is a more sane location for it. * updated files that used UFiles to point to UMain, and removed uFiles where its not needed. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@385 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index 1cfa64f5..842b225e 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -8,10 +8,13 @@ uses //------------------------------ //Includes - 3rd Party Libraries //------------------------------ + SDL in 'lib\JEDI-SDLv1.0\SDL\Pas\SDL.pas', OpenGL12 in 'lib\JEDI-SDLv1.0\OpenGL\Pas\OpenGL12.pas', bass in 'lib\bass\delphi\bass.pas', + PNGImage in 'lib\PNGImage\PNGImage.pas', + midiout in 'lib\midi\midiout.pas', midiin in 'lib\midi\midiin.pas', Circbuf in 'lib\midi\CIRCBUF.PAS', @@ -136,7 +139,6 @@ uses //Includes - Delphi //------------------------------ Windows, - SDL, SysUtils; const @@ -219,7 +221,7 @@ begin Log.BenchmarkStart(1); Log.LogStatus('Load Ini', 'Initialization'); Ini := TIni.Create; Ini.Load; - + //Load Languagefile if (Params.Language <> -1) then Language.ChangeLanguage(ILanguage[Params.Language]) @@ -229,6 +231,7 @@ begin Log.BenchmarkEnd(1); Log.LogBenchmark('Loading Ini', 1); + // LCD Log.BenchmarkStart(1); Log.LogStatus('Load LCD', 'Initialization'); LCD := TLCD.Create; @@ -251,6 +254,7 @@ begin Log.BenchmarkEnd(1); Log.LogBenchmark('Loading Light', 1); + // Theme Log.BenchmarkStart(1); Log.LogStatus('Load Themes', 'Initialization'); Theme := TTheme.Create('Themes\' + ITheme[Ini.Theme] + '.ini', Ini.Color); @@ -270,6 +274,8 @@ begin Log.BenchmarkEnd(1); Log.LogBenchmark('Loading Category Covers Array', 1); + + // Songs //Log.BenchmarkStart(1); Log.LogStatus('Creating Song Array', 'Initialization'); Songs := TSongs.Create; -- cgit v1.2.3 From f0bf8c49eadf2656bf91a4b24a6ce5106b887b0a Mon Sep 17 00:00:00 2001 From: jaybinks Date: Thu, 13 Sep 2007 09:39:24 +0000 Subject: removed unneeded DCU files from svn. fixed borked PNGImage in the project file Sorry guys :P git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@386 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index 842b225e..96172a42 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -4,6 +4,8 @@ program UltraStar; {$R 'UltraStar.res' 'UltraStar.rc'} + +// C:\Components\PngImage uses //------------------------------ //Includes - 3rd Party Libraries @@ -14,6 +16,8 @@ uses bass in 'lib\bass\delphi\bass.pas', PNGImage in 'lib\PNGImage\PNGImage.pas', + PNGzLib in 'lib\PNGImage\PNGzLib.pas', + pnglang in 'lib\PNGImage\pnglang.pas', midiout in 'lib\midi\midiout.pas', midiin in 'lib\midi\midiin.pas', -- cgit v1.2.3 From 5a778181e947cfb883f85d3239f6d1f1714dacc8 Mon Sep 17 00:00:00 2001 From: jaybinks Date: Thu, 13 Sep 2007 11:39:57 +0000 Subject: changes to make 3rd party libraries compile / work in lazarus. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@387 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 2 -- 1 file changed, 2 deletions(-) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index 96172a42..bef33632 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -4,8 +4,6 @@ program UltraStar; {$R 'UltraStar.res' 'UltraStar.rc'} - -// C:\Components\PngImage uses //------------------------------ //Includes - 3rd Party Libraries -- cgit v1.2.3 From e3fc5e2c58302159b79e0e25e183aa3e75397a41 Mon Sep 17 00:00:00 2001 From: jaybinks Date: Tue, 18 Sep 2007 11:16:30 +0000 Subject: added switches.inc , which will contain compiler directives used ( at least ) for porting to linux. this file now contains compiler directive UseSerialPort, which is conditionally set depending on the compiler. at this point lazarus will not use the serial port ( LCD or Light ) units. however this functionality should be maintained at this point in delphi. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@390 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index bef33632..df4846b3 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -3,6 +3,7 @@ program UltraStar; {$DEFINE TRANSLATE} {$R 'UltraStar.res' 'UltraStar.rc'} +{$I switches.inc} uses //------------------------------ @@ -26,8 +27,10 @@ uses MidiFile in 'lib\midi\MidiFile.PAS', Delphmcb in 'lib\midi\Delphmcb.PAS', + {$IFDEF UseSerialPort} zlportio in 'lib\zlportio\zlportio.pas', ddkint in 'lib\zlportio\ddkint.pas', + {$ENDIF} avcodec in 'lib\ffmpeg\avcodec.pas', avformat in 'lib\ffmpeg\avformat.pas', -- cgit v1.2.3 From 62c82114318ed04ce42617fa9ce2e179834dbda4 Mon Sep 17 00:00:00 2001 From: jaybinks Date: Wed, 19 Sep 2007 11:44:10 +0000 Subject: added UCommon ( in classes ) for lazarus... common functions needed for lazarus ( and others ) can be put in here. also this now compiles on lazarus.. ( dosnt link yet... but I dont get any critical compiler errors ) tested to compile in my delphi, and basic functionality is fine. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@395 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 1 + 1 file changed, 1 insertion(+) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index df4846b3..474bf173 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -60,6 +60,7 @@ uses //------------------------------ //Includes - Classes //------------------------------ + UCommon in 'Classes\UCommon.pas', UGraphic in 'Classes\UGraphic.pas', UTexture in 'Classes\UTexture.pas', UMusic in 'Classes\UMusic.pas', -- cgit v1.2.3 From 26d8c209beba866f111a9d047bf1a70fe245b75d Mon Sep 17 00:00:00 2001 From: b1indy Date: Thu, 20 Sep 2007 07:19:45 +0000 Subject: new lyrics stuff; it's broken (lyrics don't show) and in "debug" mode (weird stuff going on in the singscreen) but i'm tired of editing conflicts git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@412 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 92 ++++++++++++++----------------------------------- 1 file changed, 26 insertions(+), 66 deletions(-) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index 474bf173..65109055 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -6,46 +6,28 @@ program UltraStar; {$I switches.inc} uses - //------------------------------ - //Includes - 3rd Party Libraries - //------------------------------ - SDL in 'lib\JEDI-SDLv1.0\SDL\Pas\SDL.pas', - OpenGL12 in 'lib\JEDI-SDLv1.0\OpenGL\Pas\OpenGL12.pas', - - bass in 'lib\bass\delphi\bass.pas', - - PNGImage in 'lib\PNGImage\PNGImage.pas', - PNGzLib in 'lib\PNGImage\PNGzLib.pas', - pnglang in 'lib\PNGImage\pnglang.pas', - - midiout in 'lib\midi\midiout.pas', - midiin in 'lib\midi\midiin.pas', - Circbuf in 'lib\midi\CIRCBUF.PAS', - MidiType in 'lib\midi\MidiType.PAS', - MidiDefs in 'lib\midi\MidiDefs.PAS', - MidiCons in 'lib\midi\MidiCons.PAS', - MidiFile in 'lib\midi\MidiFile.PAS', - Delphmcb in 'lib\midi\Delphmcb.PAS', - - {$IFDEF UseSerialPort} - zlportio in 'lib\zlportio\zlportio.pas', - ddkint in 'lib\zlportio\ddkint.pas', - {$ENDIF} - - avcodec in 'lib\ffmpeg\avcodec.pas', - avformat in 'lib\ffmpeg\avformat.pas', - avutil in 'lib\ffmpeg\avutil.pas', - rational in 'lib\ffmpeg\rational.pas', - opt in 'lib\ffmpeg\opt.pas', - avio in 'lib\ffmpeg\avio.pas', - + SDL in 'lib\JEDI-SDLv1.0\SDL\Pas\SDL.pas', + OpenGL12 in 'lib\JEDI-SDLv1.0\OpenGL\Pas\OpenGL12.pas', + bass in 'lib\bass\delphi\bass.pas', + PNGImage in 'lib\PNGImage\PNGImage.pas', + PNGzLib in 'lib\PNGImage\PNGzLib.pas', + pnglang in 'lib\PNGImage\pnglang.pas', + midiout in 'lib\midi\midiout.pas', + midiin in 'lib\midi\midiin.pas', + CIRCBUF in 'lib\midi\CIRCBUF.PAS', + MidiType in 'lib\midi\MidiType.PAS', + MidiDefs in 'lib\midi\MidiDefs.PAS', + MidiCons in 'lib\midi\MidiCons.PAS', + MidiFile in 'lib\midi\MidiFile.PAS', + Delphmcb in 'lib\midi\Delphmcb.PAS', + avcodec in 'lib\ffmpeg\avcodec.pas', + avformat in 'lib\ffmpeg\avformat.pas', + avutil in 'lib\ffmpeg\avutil.pas', + rational in 'lib\ffmpeg\rational.pas', + opt in 'lib\ffmpeg\opt.pas', + avio in 'lib\ffmpeg\avio.pas', SQLiteTable3 in 'lib\SQLite\SQLiteTable3.pas', - SQLite3 in 'lib\SQLite\SQLite3.pas', - - - //------------------------------ - //Includes - Menu System - //------------------------------ + SQLite3 in 'lib\SQLite\SQLite3.pas', UDisplay in 'Menu\UDisplay.pas', UMenu in 'Menu\UMenu.pas', UMenuStatic in 'Menu\UMenuStatic.pas', @@ -56,11 +38,7 @@ uses UMenuSelectSlide in 'Menu\UMenuSelectSlide.pas', UDrawTexture in 'Menu\UDrawTexture.pas', UMenuButtonCollection in 'Menu\UMenuButtonCollection.pas', - - //------------------------------ - //Includes - Classes - //------------------------------ - UCommon in 'Classes\UCommon.pas', + UCommon in 'Classes\UCommon.pas', UGraphic in 'Classes\UGraphic.pas', UTexture in 'Classes\UTexture.pas', UMusic in 'Classes\UMusic.pas', @@ -87,16 +65,8 @@ uses UDLLManager in 'Classes\UDLLManager.pas', UParty in 'Classes\UParty.pas', UPlaylist in 'Classes\UPlaylist.pas', - UCommandLine in 'Classes\UCommandLine.pas', - - //------------------------------ - //Includes - Video Support - //------------------------------ + UCommandLine in 'Classes\UCommandLine.pas', UVideo in 'Classes\UVideo.pas', - - //------------------------------ - //Includes - Screens - //------------------------------ UScreenLoading in 'Screens\UScreenLoading.pas', UScreenWelcome in 'Screens\UScreenWelcome.pas', UScreenMain in 'Screens\UScreenMain.pas', @@ -125,27 +95,16 @@ uses UScreenStatDetail in 'Screens\UScreenStatDetail.pas', UScreenCredits in 'Screens\UScreenCredits.pas', UScreenPopup in 'Screens\UScreenPopup.pas', - - //------------------------------ - //Includes - Screens PartyMode - //------------------------------ UScreenSingModi in 'Screens\UScreenSingModi.pas', UScreenPartyNewRound in 'Screens\UScreenPartyNewRound.pas', UScreenPartyScore in 'Screens\UScreenPartyScore.pas', UScreenPartyPlayer in 'Screens\UScreenPartyPlayer.pas', UScreenPartyOptions in 'Screens\UScreenPartyOptions.pas', UScreenPartyWin in 'Screens\UScreenPartyWin.pas', - - //------------------------------ - //Includes - Modi SDK - //------------------------------ ModiSDK in '..\..\Modis\SDK\ModiSDK.pas', - - //------------------------------ - //Includes - Delphi - //------------------------------ Windows, - SysUtils; + SysUtils, + ULyrics.bak in 'Classes\ULyrics.bak.pas'; const Version = 'UltraStar Deluxe V 1.10 Alpha Build'; @@ -357,6 +316,7 @@ begin Log.BenchmarkEnd(0); Log.LogBenchmark('Loading Time', 0); + Lyric := TLyric.Create; //------------------------------ //Start- Mainloop -- cgit v1.2.3 From fb923e76a9d728805670c58a8eece411fb2b0b02 Mon Sep 17 00:00:00 2001 From: jaybinks Date: Thu, 20 Sep 2007 09:28:52 +0000 Subject: modified to make it build blindys current work. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@414 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 102 +++++++++++++++++++++++++++++++++++------------- 1 file changed, 74 insertions(+), 28 deletions(-) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index 65109055..42301946 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -1,4 +1,4 @@ -program UltraStar; +ïŧŋprogram UltraStar; {$DEFINE TRANSLATE} @@ -6,28 +6,46 @@ program UltraStar; {$I switches.inc} uses - SDL in 'lib\JEDI-SDLv1.0\SDL\Pas\SDL.pas', - OpenGL12 in 'lib\JEDI-SDLv1.0\OpenGL\Pas\OpenGL12.pas', - bass in 'lib\bass\delphi\bass.pas', - PNGImage in 'lib\PNGImage\PNGImage.pas', - PNGzLib in 'lib\PNGImage\PNGzLib.pas', - pnglang in 'lib\PNGImage\pnglang.pas', - midiout in 'lib\midi\midiout.pas', - midiin in 'lib\midi\midiin.pas', - CIRCBUF in 'lib\midi\CIRCBUF.PAS', - MidiType in 'lib\midi\MidiType.PAS', - MidiDefs in 'lib\midi\MidiDefs.PAS', - MidiCons in 'lib\midi\MidiCons.PAS', - MidiFile in 'lib\midi\MidiFile.PAS', - Delphmcb in 'lib\midi\Delphmcb.PAS', - avcodec in 'lib\ffmpeg\avcodec.pas', - avformat in 'lib\ffmpeg\avformat.pas', - avutil in 'lib\ffmpeg\avutil.pas', - rational in 'lib\ffmpeg\rational.pas', - opt in 'lib\ffmpeg\opt.pas', - avio in 'lib\ffmpeg\avio.pas', + //------------------------------ + //Includes - 3rd Party Libraries + //------------------------------ + SDL in 'lib\JEDI-SDLv1.0\SDL\Pas\SDL.pas', + OpenGL12 in 'lib\JEDI-SDLv1.0\OpenGL\Pas\OpenGL12.pas', + + bass in 'lib\bass\delphi\bass.pas', + + PNGImage in 'lib\PNGImage\PNGImage.pas', + PNGzLib in 'lib\PNGImage\PNGzLib.pas', + pnglang in 'lib\PNGImage\pnglang.pas', + + midiout in 'lib\midi\midiout.pas', + midiin in 'lib\midi\midiin.pas', + Circbuf in 'lib\midi\CIRCBUF.PAS', + MidiType in 'lib\midi\MidiType.PAS', + MidiDefs in 'lib\midi\MidiDefs.PAS', + MidiCons in 'lib\midi\MidiCons.PAS', + MidiFile in 'lib\midi\MidiFile.PAS', + Delphmcb in 'lib\midi\Delphmcb.PAS', + + {$IFDEF UseSerialPort} + zlportio in 'lib\zlportio\zlportio.pas', + ddkint in 'lib\zlportio\ddkint.pas', + {$ENDIF} + + avcodec in 'lib\ffmpeg\avcodec.pas', + avformat in 'lib\ffmpeg\avformat.pas', + avutil in 'lib\ffmpeg\avutil.pas', + rational in 'lib\ffmpeg\rational.pas', + opt in 'lib\ffmpeg\opt.pas', + avio in 'lib\ffmpeg\avio.pas', + SQLiteTable3 in 'lib\SQLite\SQLiteTable3.pas', - SQLite3 in 'lib\SQLite\SQLite3.pas', + SQLite3 in 'lib\SQLite\SQLite3.pas', + + + //------------------------------ + //Includes - Menu System + //------------------------------ UDisplay in 'Menu\UDisplay.pas', UMenu in 'Menu\UMenu.pas', UMenuStatic in 'Menu\UMenuStatic.pas', @@ -38,7 +56,11 @@ uses UMenuSelectSlide in 'Menu\UMenuSelectSlide.pas', UDrawTexture in 'Menu\UDrawTexture.pas', UMenuButtonCollection in 'Menu\UMenuButtonCollection.pas', - UCommon in 'Classes\UCommon.pas', + + //------------------------------ + //Includes - Classes + //------------------------------ + UCommon in 'Classes\UCommon.pas', UGraphic in 'Classes\UGraphic.pas', UTexture in 'Classes\UTexture.pas', UMusic in 'Classes\UMusic.pas', @@ -51,6 +73,7 @@ uses USongs in 'Classes\USongs.pas', UIni in 'Classes\UIni.pas', ULyrics in 'Classes\ULyrics.pas', + ULyrics.bak in 'Classes\ULyrics.bak.pas', USkins in 'Classes\USkins.pas', UThemes in 'Classes\UThemes.pas', ULog in 'Classes\ULog.pas', @@ -65,8 +88,16 @@ uses UDLLManager in 'Classes\UDLLManager.pas', UParty in 'Classes\UParty.pas', UPlaylist in 'Classes\UPlaylist.pas', - UCommandLine in 'Classes\UCommandLine.pas', + UCommandLine in 'Classes\UCommandLine.pas', + + //------------------------------ + //Includes - Video Support + //------------------------------ UVideo in 'Classes\UVideo.pas', + + //------------------------------ + //Includes - Screens + //------------------------------ UScreenLoading in 'Screens\UScreenLoading.pas', UScreenWelcome in 'Screens\UScreenWelcome.pas', UScreenMain in 'Screens\UScreenMain.pas', @@ -95,16 +126,29 @@ uses UScreenStatDetail in 'Screens\UScreenStatDetail.pas', UScreenCredits in 'Screens\UScreenCredits.pas', UScreenPopup in 'Screens\UScreenPopup.pas', + + //------------------------------ + //Includes - Screens PartyMode + //------------------------------ UScreenSingModi in 'Screens\UScreenSingModi.pas', UScreenPartyNewRound in 'Screens\UScreenPartyNewRound.pas', UScreenPartyScore in 'Screens\UScreenPartyScore.pas', UScreenPartyPlayer in 'Screens\UScreenPartyPlayer.pas', UScreenPartyOptions in 'Screens\UScreenPartyOptions.pas', UScreenPartyWin in 'Screens\UScreenPartyWin.pas', + + //------------------------------ + //Includes - Modi SDK + //------------------------------ ModiSDK in '..\..\Modis\SDK\ModiSDK.pas', + + //------------------------------ + //Includes - Delphi + //------------------------------ Windows, - SysUtils, - ULyrics.bak in 'Classes\ULyrics.bak.pas'; + SysUtils; + + const Version = 'UltraStar Deluxe V 1.10 Alpha Build'; @@ -124,7 +168,7 @@ begin //Programm already started if (hWnd <> 0) then begin - I := Messagebox(0, PChar('Another Instance of Ultrastar is already running. Contėnue ?'), PChar(WndTitle), MB_ICONWARNING or MB_YESNO); + I := Messagebox(0, PChar('Another Instance of Ultrastar is already running. Continue ?'), PChar(WndTitle), MB_ICONWARNING or MB_YESNO); if (I = IDYes) then begin I := 1; @@ -316,7 +360,8 @@ begin Log.BenchmarkEnd(0); Log.LogBenchmark('Loading Time', 0); - Lyric := TLyric.Create; + Lyric := TLyric.Create; + //------------------------------ //Start- Mainloop @@ -335,3 +380,4 @@ begin Log.Free; end. + -- cgit v1.2.3 From 3c41f973b397b718135a7713c7501607812b0192 Mon Sep 17 00:00:00 2001 From: jaybinks Date: Thu, 20 Sep 2007 09:42:35 +0000 Subject: renamed Ulyrics.bak.pas hack to Ulyrics_bak.pas for lazarus compatiblity. minor changes to get code base compiling in Lazarus(win) and Delphi git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@415 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index 42301946..7cbc2e55 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -73,7 +73,7 @@ uses USongs in 'Classes\USongs.pas', UIni in 'Classes\UIni.pas', ULyrics in 'Classes\ULyrics.pas', - ULyrics.bak in 'Classes\ULyrics.bak.pas', + ULyrics_bak in 'Classes\ULyrics_bak.pas', USkins in 'Classes\USkins.pas', UThemes in 'Classes\UThemes.pas', ULog in 'Classes\ULog.pas', -- cgit v1.2.3 From 50523ba17fcb19d37c54420ec3ea651538121e35 Mon Sep 17 00:00:00 2001 From: b1indy Date: Thu, 20 Sep 2007 10:39:30 +0000 Subject: moved a hack to a more appropriate place git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@417 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index 7cbc2e55..cbb5dd7e 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -1,4 +1,4 @@ -ïŧŋprogram UltraStar; +program UltraStar; {$DEFINE TRANSLATE} @@ -360,8 +360,6 @@ begin Log.BenchmarkEnd(0); Log.LogBenchmark('Loading Time', 0); - Lyric := TLyric.Create; - //------------------------------ //Start- Mainloop -- cgit v1.2.3 From cac6be301884b2c0f0b968ff156631cdda9d0410 Mon Sep 17 00:00:00 2001 From: b1indy Date: Thu, 20 Sep 2007 22:49:41 +0000 Subject: testing SDL_Image in credits screen (code is in TScreenCredits.OnShow) git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@424 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 1 + 1 file changed, 1 insertion(+) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index cbb5dd7e..773b8c67 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -10,6 +10,7 @@ uses //Includes - 3rd Party Libraries //------------------------------ SDL in 'lib\JEDI-SDLv1.0\SDL\Pas\SDL.pas', + SDL_Image in 'lib\JEDI-SDLv1.0\SDL_Image\Pas\sdl_image.pas', OpenGL12 in 'lib\JEDI-SDLv1.0\OpenGL\Pas\OpenGL12.pas', bass in 'lib\bass\delphi\bass.pas', -- cgit v1.2.3 From 217cd16e10ff809e7382e5447f1ccde60f3e8564 Mon Sep 17 00:00:00 2001 From: b1indy Date: Fri, 21 Sep 2007 22:15:36 +0000 Subject: first try to load textures with SDL_Image supported texture types are: Plain, Transparent and Colorized (textures in the resource file must be typed TEX) everything else (Font Black, ...) is not implemented. So beware - it looks really broken. There seems to be a problem with The covers - I just didn't understand, what's going on there. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@428 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index 773b8c67..f7dd7e9b 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -10,6 +10,8 @@ uses //Includes - 3rd Party Libraries //------------------------------ 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', SDL_Image in 'lib\JEDI-SDLv1.0\SDL_Image\Pas\sdl_image.pas', OpenGL12 in 'lib\JEDI-SDLv1.0\OpenGL\Pas\OpenGL12.pas', -- cgit v1.2.3 From 1f9fd791bbe68741b8273a64eb5c0abe928e431c Mon Sep 17 00:00:00 2001 From: whiteshark0 Date: Sun, 23 Sep 2007 14:00:46 +0000 Subject: New class for score management -Scores are raised when PopUp slides under the scorebg -1 to 6 Player support (even 5 Players(not supported by Core atm)) -Display 3 Players instead of 2 when 4 Players are set in the Options and Screens=2 Ratingbar is not drawn by class atm. Have to be done git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@430 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index f7dd7e9b..6aafda26 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -92,12 +92,14 @@ uses UParty in 'Classes\UParty.pas', UPlaylist in 'Classes\UPlaylist.pas', UCommandLine in 'Classes\UCommandLine.pas', + USingScores in 'Classes\USingScores.pas', + USingNotes in 'Classes\USingNotes.pas', //------------------------------ //Includes - Video Support //------------------------------ UVideo in 'Classes\UVideo.pas', - + //------------------------------ //Includes - Screens //------------------------------ @@ -233,7 +235,7 @@ begin Log.BenchmarkStart(1); Log.LogStatus('Load Ini', 'Initialization'); Ini := TIni.Create; Ini.Load; - + //Load Languagefile if (Params.Language <> -1) then Language.ChangeLanguage(ILanguage[Params.Language]) @@ -307,7 +309,7 @@ begin Log.BenchmarkStart(1); Log.LogStatus('PartySession Manager', 'Initialization'); PartySession := TParty_Session.Create; //Load PartySession - + Log.BenchmarkEnd(1); Log.LogBenchmark('Loading PartySession Manager', 1); @@ -380,5 +382,5 @@ begin if Ini.LPT = 2 then Light.TurnOff; Log.Free; -end. +end. -- cgit v1.2.3 From 60c7258e42776b9f5b054dfcaa2840f813c0a2cc Mon Sep 17 00:00:00 2001 From: jaybinks Date: Thu, 27 Sep 2007 12:15:06 +0000 Subject: test checkin to test bamboo.. :) git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@438 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index 6aafda26..f795e250 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -381,6 +381,8 @@ begin if Ini.LPT = 1 then LCD.Clear; if Ini.LPT = 2 then Light.TurnOff; + Log.LogStatus('Main Loop', 'Finished'); + Log.Free; end. -- cgit v1.2.3 From c21f87b7235114f4d7b5afdc1b097310e36e5129 Mon Sep 17 00:00:00 2001 From: mogguh Date: Mon, 1 Oct 2007 11:05:52 +0000 Subject: SDL_ttf: TextGl.pas - some code for testing (just add printrandomtext(); in ucreditsscreen (ie)) UTextClasses - started to throw everything into classes git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@455 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 105 ++++++++++++++++-------------------------------- 1 file changed, 35 insertions(+), 70 deletions(-) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index f795e250..cdd4aca4 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -6,49 +6,32 @@ program UltraStar; {$I switches.inc} uses - //------------------------------ - //Includes - 3rd Party Libraries - //------------------------------ - SDL in 'lib\JEDI-SDLv1.0\SDL\Pas\SDL.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', - SDL_Image in 'lib\JEDI-SDLv1.0\SDL_Image\Pas\sdl_image.pas', - OpenGL12 in 'lib\JEDI-SDLv1.0\OpenGL\Pas\OpenGL12.pas', - - bass in 'lib\bass\delphi\bass.pas', - - PNGImage in 'lib\PNGImage\PNGImage.pas', - PNGzLib in 'lib\PNGImage\PNGzLib.pas', - pnglang in 'lib\PNGImage\pnglang.pas', - - midiout in 'lib\midi\midiout.pas', - midiin in 'lib\midi\midiin.pas', - Circbuf in 'lib\midi\CIRCBUF.PAS', - MidiType in 'lib\midi\MidiType.PAS', - MidiDefs in 'lib\midi\MidiDefs.PAS', - MidiCons in 'lib\midi\MidiCons.PAS', - MidiFile in 'lib\midi\MidiFile.PAS', - Delphmcb in 'lib\midi\Delphmcb.PAS', - - {$IFDEF UseSerialPort} - zlportio in 'lib\zlportio\zlportio.pas', - ddkint in 'lib\zlportio\ddkint.pas', - {$ENDIF} - - avcodec in 'lib\ffmpeg\avcodec.pas', - avformat in 'lib\ffmpeg\avformat.pas', - avutil in 'lib\ffmpeg\avutil.pas', - rational in 'lib\ffmpeg\rational.pas', - opt in 'lib\ffmpeg\opt.pas', - avio in 'lib\ffmpeg\avio.pas', - + sdlutils in 'lib\JEDI-SDLv1.0\SDL\Pas\sdlutils.pas', + sdl_image in 'lib\JEDI-SDLv1.0\SDL_Image\Pas\sdl_image.pas', + OpenGL12 in 'lib\JEDI-SDLv1.0\OpenGL\Pas\OpenGL12.pas', + sdl_ttf in 'lib\JEDI-SDLv1.0\SDL_ttf\Pas\sdl_ttf.pas', + bass in 'lib\bass\delphi\bass.pas', + PNGImage in 'lib\PNGImage\PNGImage.pas', + PNGzLib in 'lib\PNGImage\PNGzLib.pas', + pnglang in 'lib\PNGImage\pnglang.pas', + midiout in 'lib\midi\midiout.pas', + midiin in 'lib\midi\midiin.pas', + CIRCBUF in 'lib\midi\CIRCBUF.PAS', + MidiType in 'lib\midi\MidiType.PAS', + MidiDefs in 'lib\midi\MidiDefs.PAS', + MidiCons in 'lib\midi\MidiCons.PAS', + MidiFile in 'lib\midi\MidiFile.PAS', + Delphmcb in 'lib\midi\Delphmcb.PAS', + avcodec in 'lib\ffmpeg\avcodec.pas', + avformat in 'lib\ffmpeg\avformat.pas', + avutil in 'lib\ffmpeg\avutil.pas', + rational in 'lib\ffmpeg\rational.pas', + opt in 'lib\ffmpeg\opt.pas', + avio in 'lib\ffmpeg\avio.pas', SQLiteTable3 in 'lib\SQLite\SQLiteTable3.pas', - SQLite3 in 'lib\SQLite\SQLite3.pas', - - - //------------------------------ - //Includes - Menu System - //------------------------------ + SQLite3 in 'lib\SQLite\SQLite3.pas', UDisplay in 'Menu\UDisplay.pas', UMenu in 'Menu\UMenu.pas', UMenuStatic in 'Menu\UMenuStatic.pas', @@ -59,11 +42,7 @@ uses UMenuSelectSlide in 'Menu\UMenuSelectSlide.pas', UDrawTexture in 'Menu\UDrawTexture.pas', UMenuButtonCollection in 'Menu\UMenuButtonCollection.pas', - - //------------------------------ - //Includes - Classes - //------------------------------ - UCommon in 'Classes\UCommon.pas', + UCommon in 'Classes\UCommon.pas', UGraphic in 'Classes\UGraphic.pas', UTexture in 'Classes\UTexture.pas', UMusic in 'Classes\UMusic.pas', @@ -91,18 +70,10 @@ uses UDLLManager in 'Classes\UDLLManager.pas', UParty in 'Classes\UParty.pas', UPlaylist in 'Classes\UPlaylist.pas', - UCommandLine in 'Classes\UCommandLine.pas', + UCommandLine in 'Classes\UCommandLine.pas', USingScores in 'Classes\USingScores.pas', USingNotes in 'Classes\USingNotes.pas', - - //------------------------------ - //Includes - Video Support - //------------------------------ UVideo in 'Classes\UVideo.pas', - - //------------------------------ - //Includes - Screens - //------------------------------ UScreenLoading in 'Screens\UScreenLoading.pas', UScreenWelcome in 'Screens\UScreenWelcome.pas', UScreenMain in 'Screens\UScreenMain.pas', @@ -131,29 +102,16 @@ uses UScreenStatDetail in 'Screens\UScreenStatDetail.pas', UScreenCredits in 'Screens\UScreenCredits.pas', UScreenPopup in 'Screens\UScreenPopup.pas', - - //------------------------------ - //Includes - Screens PartyMode - //------------------------------ UScreenSingModi in 'Screens\UScreenSingModi.pas', UScreenPartyNewRound in 'Screens\UScreenPartyNewRound.pas', UScreenPartyScore in 'Screens\UScreenPartyScore.pas', UScreenPartyPlayer in 'Screens\UScreenPartyPlayer.pas', UScreenPartyOptions in 'Screens\UScreenPartyOptions.pas', UScreenPartyWin in 'Screens\UScreenPartyWin.pas', - - //------------------------------ - //Includes - Modi SDK - //------------------------------ ModiSDK in '..\..\Modis\SDK\ModiSDK.pas', - - //------------------------------ - //Includes - Delphi - //------------------------------ Windows, - SysUtils; - - + SysUtils, + UTextClasses in 'Classes\UTextClasses.pas'; const Version = 'UltraStar Deluxe V 1.10 Alpha Build'; @@ -218,6 +176,13 @@ begin Log.BenchmarkEnd(1); Log.LogBenchmark('Initializing SDL', 1); + // SDL_ttf + Log.BenchmarkStart(1); + Log.LogStatus('Initialize SDL_ttf', 'Initialization'); + TTF_Init(); //ttf_quit(); + Log.BenchmarkEnd(1); + Log.LogBenchmark('Initializing SDL_ttf', 1); + // Skin Log.BenchmarkStart(1); Log.LogStatus('Loading Skin List', 'Initialization'); Skin := TSkin.Create; -- cgit v1.2.3 From f1f9e98eb09722bc8f8b6370331d3bb76fbdda2d Mon Sep 17 00:00:00 2001 From: whiteshark0 Date: Wed, 3 Oct 2007 11:51:44 +0000 Subject: some cleanup after mogs last commit ;) git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@464 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 97 +++++++++++++++++++++++++++++++++++-------------- 1 file changed, 69 insertions(+), 28 deletions(-) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index cdd4aca4..901bb57b 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -6,32 +6,49 @@ program UltraStar; {$I switches.inc} uses - SDL in 'lib\JEDI-SDLv1.0\SDL\Pas\SDL.pas', + //------------------------------ + //Includes - 3rd Party Libraries + //------------------------------ + 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', - sdl_image in 'lib\JEDI-SDLv1.0\SDL_Image\Pas\sdl_image.pas', - OpenGL12 in 'lib\JEDI-SDLv1.0\OpenGL\Pas\OpenGL12.pas', - sdl_ttf in 'lib\JEDI-SDLv1.0\SDL_ttf\Pas\sdl_ttf.pas', - bass in 'lib\bass\delphi\bass.pas', - PNGImage in 'lib\PNGImage\PNGImage.pas', - PNGzLib in 'lib\PNGImage\PNGzLib.pas', - pnglang in 'lib\PNGImage\pnglang.pas', - midiout in 'lib\midi\midiout.pas', - midiin in 'lib\midi\midiin.pas', - CIRCBUF in 'lib\midi\CIRCBUF.PAS', - MidiType in 'lib\midi\MidiType.PAS', - MidiDefs in 'lib\midi\MidiDefs.PAS', - MidiCons in 'lib\midi\MidiCons.PAS', - MidiFile in 'lib\midi\MidiFile.PAS', - Delphmcb in 'lib\midi\Delphmcb.PAS', - avcodec in 'lib\ffmpeg\avcodec.pas', - avformat in 'lib\ffmpeg\avformat.pas', - avutil in 'lib\ffmpeg\avutil.pas', - rational in 'lib\ffmpeg\rational.pas', - opt in 'lib\ffmpeg\opt.pas', - avio in 'lib\ffmpeg\avio.pas', + sdlutils in 'lib\JEDI-SDLv1.0\SDL\Pas\sdlutils.pas', + SDL_Image in 'lib\JEDI-SDLv1.0\SDL_Image\Pas\sdl_image.pas', + OpenGL12 in 'lib\JEDI-SDLv1.0\OpenGL\Pas\OpenGL12.pas', + + bass in 'lib\bass\delphi\bass.pas', + + PNGImage in 'lib\PNGImage\PNGImage.pas', + PNGzLib in 'lib\PNGImage\PNGzLib.pas', + pnglang in 'lib\PNGImage\pnglang.pas', + + midiout in 'lib\midi\midiout.pas', + midiin in 'lib\midi\midiin.pas', + Circbuf in 'lib\midi\CIRCBUF.PAS', + MidiType in 'lib\midi\MidiType.PAS', + MidiDefs in 'lib\midi\MidiDefs.PAS', + MidiCons in 'lib\midi\MidiCons.PAS', + MidiFile in 'lib\midi\MidiFile.PAS', + Delphmcb in 'lib\midi\Delphmcb.PAS', + + {$IFDEF UseSerialPort} + zlportio in 'lib\zlportio\zlportio.pas', + ddkint in 'lib\zlportio\ddkint.pas', + {$ENDIF} + + avcodec in 'lib\ffmpeg\avcodec.pas', + avformat in 'lib\ffmpeg\avformat.pas', + avutil in 'lib\ffmpeg\avutil.pas', + rational in 'lib\ffmpeg\rational.pas', + opt in 'lib\ffmpeg\opt.pas', + avio in 'lib\ffmpeg\avio.pas', + SQLiteTable3 in 'lib\SQLite\SQLiteTable3.pas', - SQLite3 in 'lib\SQLite\SQLite3.pas', + SQLite3 in 'lib\SQLite\SQLite3.pas', + + + //------------------------------ + //Includes - Menu System + //------------------------------ UDisplay in 'Menu\UDisplay.pas', UMenu in 'Menu\UMenu.pas', UMenuStatic in 'Menu\UMenuStatic.pas', @@ -42,6 +59,10 @@ uses UMenuSelectSlide in 'Menu\UMenuSelectSlide.pas', UDrawTexture in 'Menu\UDrawTexture.pas', UMenuButtonCollection in 'Menu\UMenuButtonCollection.pas', + + //------------------------------ + //Includes - Classes + //------------------------------ UCommon in 'Classes\UCommon.pas', UGraphic in 'Classes\UGraphic.pas', UTexture in 'Classes\UTexture.pas', @@ -70,10 +91,19 @@ uses UDLLManager in 'Classes\UDLLManager.pas', UParty in 'Classes\UParty.pas', UPlaylist in 'Classes\UPlaylist.pas', - UCommandLine in 'Classes\UCommandLine.pas', + UCommandLine in 'Classes\UCommandLine.pas', + UTextClasses in 'Classes\UTextClasses.pas', USingScores in 'Classes\USingScores.pas', USingNotes in 'Classes\USingNotes.pas', + + //------------------------------ + //Includes - Video Support + //------------------------------ UVideo in 'Classes\UVideo.pas', + + //------------------------------ + //Includes - Screens + //------------------------------ UScreenLoading in 'Screens\UScreenLoading.pas', UScreenWelcome in 'Screens\UScreenWelcome.pas', UScreenMain in 'Screens\UScreenMain.pas', @@ -102,16 +132,27 @@ uses UScreenStatDetail in 'Screens\UScreenStatDetail.pas', UScreenCredits in 'Screens\UScreenCredits.pas', UScreenPopup in 'Screens\UScreenPopup.pas', + + //------------------------------ + //Includes - Screens PartyMode + //------------------------------ UScreenSingModi in 'Screens\UScreenSingModi.pas', UScreenPartyNewRound in 'Screens\UScreenPartyNewRound.pas', UScreenPartyScore in 'Screens\UScreenPartyScore.pas', UScreenPartyPlayer in 'Screens\UScreenPartyPlayer.pas', UScreenPartyOptions in 'Screens\UScreenPartyOptions.pas', UScreenPartyWin in 'Screens\UScreenPartyWin.pas', + + //------------------------------ + //Includes - Modi SDK + //------------------------------ ModiSDK in '..\..\Modis\SDK\ModiSDK.pas', + + //------------------------------ + //Includes - Delphi + //------------------------------ Windows, - SysUtils, - UTextClasses in 'Classes\UTextClasses.pas'; + SysUtils; const Version = 'UltraStar Deluxe V 1.10 Alpha Build'; @@ -350,4 +391,4 @@ begin Log.Free; -end. +end. \ No newline at end of file -- cgit v1.2.3 From 2e7eca65cf05d8090ef58381d576d5218edd9654 Mon Sep 17 00:00:00 2001 From: whiteshark0 Date: Wed, 3 Oct 2007 12:00:09 +0000 Subject: Some more clean up because of my last commit 0o git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@465 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index 901bb57b..ea1ccdf4 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -12,8 +12,9 @@ uses 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', - SDL_Image in 'lib\JEDI-SDLv1.0\SDL_Image\Pas\sdl_image.pas', + sdl_image in 'lib\JEDI-SDLv1.0\SDL_Image\Pas\sdl_image.pas', OpenGL12 in 'lib\JEDI-SDLv1.0\OpenGL\Pas\OpenGL12.pas', + sdl_ttf in 'lib\JEDI-SDLv1.0\SDL_ttf\Pas\sdl_ttf.pas', bass in 'lib\bass\delphi\bass.pas', -- cgit v1.2.3 From fdb75fa47dd72522b705e94be5a201c4e1a731cb Mon Sep 17 00:00:00 2001 From: whiteshark0 Date: Wed, 3 Oct 2007 12:43:01 +0000 Subject: New plugin SDK added Some more debug information for windows builds (Does this work in lazarus?) git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@466 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index ea1ccdf4..b9fa0530 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -1,6 +1,7 @@ program UltraStar; {$DEFINE TRANSLATE} +{$DEFINE DEBUG} //Remove b4 release {$R 'UltraStar.res' 'UltraStar.rc'} {$I switches.inc} @@ -97,6 +98,14 @@ uses USingScores in 'Classes\USingScores.pas', USingNotes in 'Classes\USingNotes.pas', + //New Plugin and Core Management + {ULists in 'Classes\ULists.pas', //maybe drop this + UHooks in 'Classes\UHooks.pas', //80 % - Whiteshark is about to work on this + UServices in 'Classes\UServices.pas', //20 % - Whiteshark is about to work on this + UCore in 'Classes\UCore.pas', + UCoreModule in 'Classes\UCoreModule.pas', } + UPluginInterface in 'Classes\UPluginInterface.pas', //Some changes to work with unwriten classes, need to be done + //------------------------------ //Includes - Video Support //------------------------------ @@ -148,6 +157,7 @@ uses //Includes - Modi SDK //------------------------------ ModiSDK in '..\..\Modis\SDK\ModiSDK.pas', + UPluginDefs in '..\..\Modis\SDK\UPluginDefs.pas', //New Plugin SDK //------------------------------ //Includes - Delphi -- cgit v1.2.3 From 621bfb05407a169f6511f5b115d0622e5ec8bdd5 Mon Sep 17 00:00:00 2001 From: whiteshark0 Date: Wed, 10 Oct 2007 17:50:05 +0000 Subject: Added Hook and Service Class for new Plugin System to Trunc Added Core and CoreModule. That maybe will be used for new Core management. Core needs many code to write Some Info to Plugin SDK added git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@497 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index b9fa0530..b154c653 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -1,8 +1,5 @@ program UltraStar; -{$DEFINE TRANSLATE} -{$DEFINE DEBUG} //Remove b4 release - {$R 'UltraStar.res' 'UltraStar.rc'} {$I switches.inc} @@ -99,11 +96,11 @@ uses USingNotes in 'Classes\USingNotes.pas', //New Plugin and Core Management - {ULists in 'Classes\ULists.pas', //maybe drop this - UHooks in 'Classes\UHooks.pas', //80 % - Whiteshark is about to work on this - UServices in 'Classes\UServices.pas', //20 % - Whiteshark is about to work on this - UCore in 'Classes\UCore.pas', - UCoreModule in 'Classes\UCoreModule.pas', } + UModules in 'Classes\UModules.pas', //This Unit contains a const with the Modules to Load + UHooks in 'Classes\UHooks.pas', //Class for Hook Management //Write Freeing Methods for Both + UServices in 'Classes\UServices.pas', //95% - One Hack to remove ;) + UCore in 'Classes\UCore.pas', //30 % - Many Classes needs Rewriting or Manipulation + UCoreModule in 'Classes\UCoreModule.pas', UPluginInterface in 'Classes\UPluginInterface.pas', //Some changes to work with unwriten classes, need to be done //------------------------------ @@ -191,7 +188,7 @@ begin Inc(I); hWnd := FindWindow(nil, PChar(WndTitle + ' Instance ' + InttoStr(I))); until (hWnd = 0); - + MessageBox( WndTitle := WndTitle + ' Instance ' + InttoStr(I); end else -- cgit v1.2.3 From 2f80e3be339f528bd0c7ef54db8ff7cc641883e3 Mon Sep 17 00:00:00 2001 From: whiteshark0 Date: Wed, 10 Oct 2007 18:07:01 +0000 Subject: Fixed some Bugs from Previous Commit git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@498 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 1 - 1 file changed, 1 deletion(-) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index b154c653..ed58e97f 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -188,7 +188,6 @@ begin Inc(I); hWnd := FindWindow(nil, PChar(WndTitle + ' Instance ' + InttoStr(I))); until (hWnd = 0); - MessageBox( WndTitle := WndTitle + ' Instance ' + InttoStr(I); end else -- cgit v1.2.3 From 44554c7908f7e2405a249331f00a35703f5939c2 Mon Sep 17 00:00:00 2001 From: jaybinks Date: Thu, 11 Oct 2007 12:02:20 +0000 Subject: Added IAudioPlayback Interface and implementation for BASS. Created "AudioPlayback" Global Singleton, which removed the need for the "Music" Global variable. This was done because global singleton objects are a recognized better "design pattern" achieving the same thing as global variables, but in a nicer way. I will be working to a) separate IAudioPlayback in to separate "Playback" and "Input" Interfaces b) build a FFMpeg class that implements IAudioPlayback git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@504 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 110 +++++++++++++++--------------------------------- 1 file changed, 33 insertions(+), 77 deletions(-) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index ed58e97f..239984b5 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -4,50 +4,32 @@ program UltraStar; {$I switches.inc} uses - //------------------------------ - //Includes - 3rd Party Libraries - //------------------------------ - SDL in 'lib\JEDI-SDLv1.0\SDL\Pas\SDL.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', - sdl_image in 'lib\JEDI-SDLv1.0\SDL_Image\Pas\sdl_image.pas', - OpenGL12 in 'lib\JEDI-SDLv1.0\OpenGL\Pas\OpenGL12.pas', - sdl_ttf in 'lib\JEDI-SDLv1.0\SDL_ttf\Pas\sdl_ttf.pas', - - bass in 'lib\bass\delphi\bass.pas', - - PNGImage in 'lib\PNGImage\PNGImage.pas', - PNGzLib in 'lib\PNGImage\PNGzLib.pas', - pnglang in 'lib\PNGImage\pnglang.pas', - - midiout in 'lib\midi\midiout.pas', - midiin in 'lib\midi\midiin.pas', - Circbuf in 'lib\midi\CIRCBUF.PAS', - MidiType in 'lib\midi\MidiType.PAS', - MidiDefs in 'lib\midi\MidiDefs.PAS', - MidiCons in 'lib\midi\MidiCons.PAS', - MidiFile in 'lib\midi\MidiFile.PAS', - Delphmcb in 'lib\midi\Delphmcb.PAS', - - {$IFDEF UseSerialPort} - zlportio in 'lib\zlportio\zlportio.pas', - ddkint in 'lib\zlportio\ddkint.pas', - {$ENDIF} - - avcodec in 'lib\ffmpeg\avcodec.pas', - avformat in 'lib\ffmpeg\avformat.pas', - avutil in 'lib\ffmpeg\avutil.pas', - rational in 'lib\ffmpeg\rational.pas', - opt in 'lib\ffmpeg\opt.pas', - avio in 'lib\ffmpeg\avio.pas', - + sdlutils in 'lib\JEDI-SDLv1.0\SDL\Pas\sdlutils.pas', + sdl_image in 'lib\JEDI-SDLv1.0\SDL_Image\Pas\sdl_image.pas', + OpenGL12 in 'lib\JEDI-SDLv1.0\OpenGL\Pas\OpenGL12.pas', + sdl_ttf in 'lib\JEDI-SDLv1.0\SDL_ttf\Pas\sdl_ttf.pas', + bass in 'lib\bass\delphi\bass.pas', + PNGImage in 'lib\PNGImage\PNGImage.pas', + PNGzLib in 'lib\PNGImage\PNGzLib.pas', + pnglang in 'lib\PNGImage\pnglang.pas', + midiout in 'lib\midi\midiout.pas', + midiin in 'lib\midi\midiin.pas', + CIRCBUF in 'lib\midi\CIRCBUF.PAS', + MidiType in 'lib\midi\MidiType.PAS', + MidiDefs in 'lib\midi\MidiDefs.PAS', + MidiCons in 'lib\midi\MidiCons.PAS', + MidiFile in 'lib\midi\MidiFile.PAS', + Delphmcb in 'lib\midi\Delphmcb.PAS', + avcodec in 'lib\ffmpeg\avcodec.pas', + avformat in 'lib\ffmpeg\avformat.pas', + avutil in 'lib\ffmpeg\avutil.pas', + rational in 'lib\ffmpeg\rational.pas', + opt in 'lib\ffmpeg\opt.pas', + avio in 'lib\ffmpeg\avio.pas', SQLiteTable3 in 'lib\SQLite\SQLiteTable3.pas', - SQLite3 in 'lib\SQLite\SQLite3.pas', - - - //------------------------------ - //Includes - Menu System - //------------------------------ + SQLite3 in 'lib\SQLite\SQLite3.pas', UDisplay in 'Menu\UDisplay.pas', UMenu in 'Menu\UMenu.pas', UMenuStatic in 'Menu\UMenuStatic.pas', @@ -58,14 +40,11 @@ uses UMenuSelectSlide in 'Menu\UMenuSelectSlide.pas', UDrawTexture in 'Menu\UDrawTexture.pas', UMenuButtonCollection in 'Menu\UMenuButtonCollection.pas', - - //------------------------------ - //Includes - Classes - //------------------------------ UCommon in 'Classes\UCommon.pas', UGraphic in 'Classes\UGraphic.pas', UTexture in 'Classes\UTexture.pas', UMusic in 'Classes\UMusic.pas', + UMusic_BASS in 'Classes\UMusic_BASS.pas', ULanguage in 'Classes\ULanguage.pas', UMain in 'Classes\UMain.pas', UDraw in 'Classes\UDraw.pas', @@ -90,27 +69,17 @@ uses UDLLManager in 'Classes\UDLLManager.pas', UParty in 'Classes\UParty.pas', UPlaylist in 'Classes\UPlaylist.pas', - UCommandLine in 'Classes\UCommandLine.pas', + UCommandLine in 'Classes\UCommandLine.pas', UTextClasses in 'Classes\UTextClasses.pas', USingScores in 'Classes\USingScores.pas', USingNotes in 'Classes\USingNotes.pas', - - //New Plugin and Core Management - UModules in 'Classes\UModules.pas', //This Unit contains a const with the Modules to Load - UHooks in 'Classes\UHooks.pas', //Class for Hook Management //Write Freeing Methods for Both - UServices in 'Classes\UServices.pas', //95% - One Hack to remove ;) - UCore in 'Classes\UCore.pas', //30 % - Many Classes needs Rewriting or Manipulation + UModules in 'Classes\UModules.pas', + UHooks in 'Classes\UHooks.pas', + UServices in 'Classes\UServices.pas', + UCore in 'Classes\UCore.pas', UCoreModule in 'Classes\UCoreModule.pas', - UPluginInterface in 'Classes\UPluginInterface.pas', //Some changes to work with unwriten classes, need to be done - - //------------------------------ - //Includes - Video Support - //------------------------------ + UPluginInterface in 'Classes\UPluginInterface.pas', UVideo in 'Classes\UVideo.pas', - - //------------------------------ - //Includes - Screens - //------------------------------ UScreenLoading in 'Screens\UScreenLoading.pas', UScreenWelcome in 'Screens\UScreenWelcome.pas', UScreenMain in 'Screens\UScreenMain.pas', @@ -139,26 +108,14 @@ uses UScreenStatDetail in 'Screens\UScreenStatDetail.pas', UScreenCredits in 'Screens\UScreenCredits.pas', UScreenPopup in 'Screens\UScreenPopup.pas', - - //------------------------------ - //Includes - Screens PartyMode - //------------------------------ UScreenSingModi in 'Screens\UScreenSingModi.pas', UScreenPartyNewRound in 'Screens\UScreenPartyNewRound.pas', UScreenPartyScore in 'Screens\UScreenPartyScore.pas', UScreenPartyPlayer in 'Screens\UScreenPartyPlayer.pas', UScreenPartyOptions in 'Screens\UScreenPartyOptions.pas', UScreenPartyWin in 'Screens\UScreenPartyWin.pas', - - //------------------------------ - //Includes - Modi SDK - //------------------------------ ModiSDK in '..\..\Modis\SDK\ModiSDK.pas', - UPluginDefs in '..\..\Modis\SDK\UPluginDefs.pas', //New Plugin SDK - - //------------------------------ - //Includes - Delphi - //------------------------------ + UPluginDefs in '..\..\Modis\SDK\UPluginDefs.pas', Windows, SysUtils; @@ -335,8 +292,7 @@ begin // Sound Log.BenchmarkStart(1); Log.LogStatus('Initialize Sound', 'Initialization'); - Log.LogStatus('Creating Music', 'InitializeSound'); Music := TMusic.Create; - InitializeSound; + Log.LogStatus('Creating Music', 'InitializeSound'); InitializeSound(); Log.BenchmarkEnd(1); Log.LogBenchmark('Initializing Sound', 1); -- cgit v1.2.3 From df37a6a52ea5b1856e9e0e4d924a859f3fa472e1 Mon Sep 17 00:00:00 2001 From: jaybinks Date: Thu, 11 Oct 2007 13:32:43 +0000 Subject: added UAudio_FFMpeg.pas as placeholder... ( Still has bass code in it.. needs to be replaced with ffmpeg code ) UMusic ( And UAudio* ) files, now have proper IAudioPlayback and IAudioInput Interface enumeration. simply having the unit in the uses clause will make it available. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@506 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index 239984b5..de34aa52 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -43,8 +43,12 @@ uses UCommon in 'Classes\UCommon.pas', UGraphic in 'Classes\UGraphic.pas', UTexture in 'Classes\UTexture.pas', - UMusic in 'Classes\UMusic.pas', - UMusic_BASS in 'Classes\UMusic_BASS.pas', + + UMusic in 'Classes\UMusic.pas', + UAudio_FFMpeg in 'Classes\UAudio_FFMpeg.pas', + UAudio_Bass in 'Classes\UAudio_Bass.pas', + + ULanguage in 'Classes\ULanguage.pas', UMain in 'Classes\UMain.pas', UDraw in 'Classes\UDraw.pas', @@ -291,8 +295,7 @@ begin // Sound Log.BenchmarkStart(1); - Log.LogStatus('Initialize Sound', 'Initialization'); - Log.LogStatus('Creating Music', 'InitializeSound'); InitializeSound(); + Log.LogStatus('Initialize Sound', 'Initialization'); InitializeSound(); Log.BenchmarkEnd(1); Log.LogBenchmark('Initializing Sound', 1); -- cgit v1.2.3 From 8c923b5b76bb17e00132a0b2b2b96de34265fc63 Mon Sep 17 00:00:00 2001 From: jaybinks Date: Tue, 16 Oct 2007 11:27:23 +0000 Subject: modified ffmpeg usage, to use interface same as bass... still needs some tidy up, but its working. :) git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@515 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index de34aa52..44f48f12 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -45,8 +45,12 @@ uses UTexture in 'Classes\UTexture.pas', UMusic in 'Classes\UMusic.pas', - UAudio_FFMpeg in 'Classes\UAudio_FFMpeg.pas', + UMedia_dummy in 'Classes\UMedia_dummy.pas', + + // UAudio_FFMpeg in 'Classes\UAudio_FFMpeg.pas', UAudio_Bass in 'Classes\UAudio_Bass.pas', + UVideo in 'Classes\UVideo.pas', + ULanguage in 'Classes\ULanguage.pas', @@ -83,7 +87,7 @@ uses UCore in 'Classes\UCore.pas', UCoreModule in 'Classes\UCoreModule.pas', UPluginInterface in 'Classes\UPluginInterface.pas', - UVideo in 'Classes\UVideo.pas', + UScreenLoading in 'Screens\UScreenLoading.pas', UScreenWelcome in 'Screens\UScreenWelcome.pas', UScreenMain in 'Screens\UScreenMain.pas', @@ -134,6 +138,11 @@ var begin WndTitle := Version; +// InitializeSound(); +// writeln( 'DONE' ); +// exit; + + //------------------------------ //Start more than One Time Prevention //------------------------------ @@ -243,6 +252,7 @@ begin Log.LogBenchmark('Loading Light', 1); + // Theme Log.BenchmarkStart(1); Log.LogStatus('Load Themes', 'Initialization'); Theme := TTheme.Create('Themes\' + ITheme[Ini.Theme] + '.ini', Ini.Color); @@ -262,8 +272,6 @@ begin Log.BenchmarkEnd(1); Log.LogBenchmark('Loading Category Covers Array', 1); - - // Songs //Log.BenchmarkStart(1); Log.LogStatus('Creating Song Array', 'Initialization'); Songs := TSongs.Create; @@ -287,18 +295,19 @@ begin Log.BenchmarkEnd(1); Log.LogBenchmark('Loading PartySession Manager', 1); - // Graphics - Log.BenchmarkStart(1); - Log.LogStatus('Initialize 3D', 'Initialization'); Initialize3D(WndTitle); - Log.BenchmarkEnd(1); - Log.LogBenchmark('Initializing 3D', 1); - // Sound Log.BenchmarkStart(1); Log.LogStatus('Initialize Sound', 'Initialization'); InitializeSound(); Log.BenchmarkEnd(1); Log.LogBenchmark('Initializing Sound', 1); + + // Graphics + Log.BenchmarkStart(1); + Log.LogStatus('Initialize 3D', 'Initialization'); Initialize3D(WndTitle); + Log.BenchmarkEnd(1); + Log.LogBenchmark('Initializing 3D', 1); + // Score Saving System Log.BenchmarkStart(1); Log.LogStatus('DataBase System', 'Initialization'); -- cgit v1.2.3 From 659f88b3328ab25380777d2f04124ff5e5c444ba Mon Sep 17 00:00:00 2001 From: jaybinks Date: Tue, 16 Oct 2007 11:36:18 +0000 Subject: tidy up un-needed uses clauses.. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@516 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index 44f48f12..9cdbca50 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -49,7 +49,7 @@ uses // UAudio_FFMpeg in 'Classes\UAudio_FFMpeg.pas', UAudio_Bass in 'Classes\UAudio_Bass.pas', - UVideo in 'Classes\UVideo.pas', + UVideo in 'Classes\UVideo.pas', -- cgit v1.2.3 From 4231c33ad7c7765fd3851c5c7168f8c7d367deef Mon Sep 17 00:00:00 2001 From: whiteshark0 Date: Tue, 16 Oct 2007 23:19:11 +0000 Subject: nearly finished Cores loading procs Add PluginLoader Unit to implent new PluginLoader Reordered Delphi .dpr uses clausel git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@519 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 72 ++++++++++++++++++++++++++++++++++++------------- 1 file changed, 53 insertions(+), 19 deletions(-) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index 9cdbca50..1e418a49 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -4,16 +4,22 @@ program UltraStar; {$I switches.inc} uses + //------------------------------ + //Includes - 3rd Party Libraries + //------------------------------ 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', sdl_image in 'lib\JEDI-SDLv1.0\SDL_Image\Pas\sdl_image.pas', OpenGL12 in 'lib\JEDI-SDLv1.0\OpenGL\Pas\OpenGL12.pas', sdl_ttf in 'lib\JEDI-SDLv1.0\SDL_ttf\Pas\sdl_ttf.pas', + bass in 'lib\bass\delphi\bass.pas', + PNGImage in 'lib\PNGImage\PNGImage.pas', PNGzLib in 'lib\PNGImage\PNGzLib.pas', pnglang in 'lib\PNGImage\pnglang.pas', + midiout in 'lib\midi\midiout.pas', midiin in 'lib\midi\midiin.pas', CIRCBUF in 'lib\midi\CIRCBUF.PAS', @@ -22,14 +28,20 @@ uses MidiCons in 'lib\midi\MidiCons.PAS', MidiFile in 'lib\midi\MidiFile.PAS', Delphmcb in 'lib\midi\Delphmcb.PAS', + avcodec in 'lib\ffmpeg\avcodec.pas', avformat in 'lib\ffmpeg\avformat.pas', avutil in 'lib\ffmpeg\avutil.pas', rational in 'lib\ffmpeg\rational.pas', opt in 'lib\ffmpeg\opt.pas', avio in 'lib\ffmpeg\avio.pas', + SQLiteTable3 in 'lib\SQLite\SQLiteTable3.pas', SQLite3 in 'lib\SQLite\SQLite3.pas', + + //------------------------------ + //Includes - Menu System + //------------------------------ UDisplay in 'Menu\UDisplay.pas', UMenu in 'Menu\UMenu.pas', UMenuStatic in 'Menu\UMenuStatic.pas', @@ -40,19 +52,15 @@ uses UMenuSelectSlide in 'Menu\UMenuSelectSlide.pas', UDrawTexture in 'Menu\UDrawTexture.pas', UMenuButtonCollection in 'Menu\UMenuButtonCollection.pas', + + //------------------------------ + //Includes - Classes + //------------------------------ UCommon in 'Classes\UCommon.pas', UGraphic in 'Classes\UGraphic.pas', UTexture in 'Classes\UTexture.pas', - - UMusic in 'Classes\UMusic.pas', - UMedia_dummy in 'Classes\UMedia_dummy.pas', - - // UAudio_FFMpeg in 'Classes\UAudio_FFMpeg.pas', - UAudio_Bass in 'Classes\UAudio_Bass.pas', - UVideo in 'Classes\UVideo.pas', - - - + UMusic in 'Classes\UMusic.pas', + UAudio_Bass in 'Classes\UAudio_Bass.pas', ULanguage in 'Classes\ULanguage.pas', UMain in 'Classes\UMain.pas', UDraw in 'Classes\UDraw.pas', @@ -75,19 +83,31 @@ uses UFiles in 'Classes\UFiles.pas', UGraphicClasses in 'Classes\UGraphicClasses.pas', UDLLManager in 'Classes\UDLLManager.pas', - UParty in 'Classes\UParty.pas', UPlaylist in 'Classes\UPlaylist.pas', UCommandLine in 'Classes\UCommandLine.pas', UTextClasses in 'Classes\UTextClasses.pas', USingScores in 'Classes\USingScores.pas', USingNotes in 'Classes\USingNotes.pas', - UModules in 'Classes\UModules.pas', - UHooks in 'Classes\UHooks.pas', - UServices in 'Classes\UServices.pas', - UCore in 'Classes\UCore.pas', - UCoreModule in 'Classes\UCoreModule.pas', - UPluginInterface in 'Classes\UPluginInterface.pas', + UModules in 'Classes\UModules.pas', //List of Modules to Load + UHooks in 'Classes\UHooks.pas', //Hook Managing + UServices in 'Classes\UServices.pas',//Service Managing + UCore in 'Classes\UCore.pas', //Core, Maybe remove this + UCoreModule in 'Classes\UCoreModule.pas', //^ + UPluginInterface in 'Classes\UPluginInterface.pas', //Interface offered by Core to Plugins + uPluginLoader in 'Classes\uPluginLoader.pas', //New Plugin Loader Module + + UParty in 'Classes\UParty.pas', // to - do : rewrite Party Manager as Module, reomplent ability to offer party Mody by Plugin + + //------------------------------ + //Includes - Video Support + //------------------------------ + UMedia_dummy in 'Classes\UMedia_dummy.pas', + UVideo in 'Classes\UVideo.pas', + + //------------------------------ + //Includes - Screens + //------------------------------ UScreenLoading in 'Screens\UScreenLoading.pas', UScreenWelcome in 'Screens\UScreenWelcome.pas', UScreenMain in 'Screens\UScreenMain.pas', @@ -116,14 +136,23 @@ uses UScreenStatDetail in 'Screens\UScreenStatDetail.pas', UScreenCredits in 'Screens\UScreenCredits.pas', UScreenPopup in 'Screens\UScreenPopup.pas', + + //------------------------------ + //Includes - Screens PartyMode + //------------------------------ UScreenSingModi in 'Screens\UScreenSingModi.pas', UScreenPartyNewRound in 'Screens\UScreenPartyNewRound.pas', UScreenPartyScore in 'Screens\UScreenPartyScore.pas', UScreenPartyPlayer in 'Screens\UScreenPartyPlayer.pas', UScreenPartyOptions in 'Screens\UScreenPartyOptions.pas', UScreenPartyWin in 'Screens\UScreenPartyWin.pas', - ModiSDK in '..\..\Modis\SDK\ModiSDK.pas', - UPluginDefs in '..\..\Modis\SDK\UPluginDefs.pas', + + //------------------------------ + //Includes - Modi SDK + //------------------------------ + ModiSDK in '..\..\Modis\SDK\ModiSDK.pas', //Old SDK, will be deleted soon + UPluginDefs in '..\..\Modis\SDK\UPluginDefs.pas', //New SDK, not only Modis + Windows, SysUtils; @@ -346,6 +375,11 @@ begin Log.BenchmarkEnd(0); Log.LogBenchmark('Loading Time', 0); + Log.LogError('Creating Core'); + Core := TCore.Create('Ultrastar Deluxe Beta', MakeVersion(1,1,0, chr(0))); + + Log.LogError('Running Core'); + Core.Run; //------------------------------ //Start- Mainloop -- cgit v1.2.3 From 8cca9e3e6f591c35d35d132a9d3f93ffc7cdfee8 Mon Sep 17 00:00:00 2001 From: jaybinks Date: Sat, 27 Oct 2007 06:31:04 +0000 Subject: made some major progress with ffmpeg audio playback !!! YAY !!! still a little choppy, so I suspect incorrect buffer sizes or something like that. also made some mods to support Unicode song file iteration on windows, this is no worse than what we had before, but is not complete.. oh this code only supports win 2000 and up .. no Win 98... git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@533 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index 1e418a49..0b7e8449 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -59,8 +59,6 @@ uses UCommon in 'Classes\UCommon.pas', UGraphic in 'Classes\UGraphic.pas', UTexture in 'Classes\UTexture.pas', - UMusic in 'Classes\UMusic.pas', - UAudio_Bass in 'Classes\UAudio_Bass.pas', ULanguage in 'Classes\ULanguage.pas', UMain in 'Classes\UMain.pas', UDraw in 'Classes\UDraw.pas', @@ -100,10 +98,14 @@ uses UParty in 'Classes\UParty.pas', // to - do : rewrite Party Manager as Module, reomplent ability to offer party Mody by Plugin //------------------------------ - //Includes - Video Support + //Includes - Media support classes.... + // Make sure UMedia always first, then UMedia_dummy //------------------------------ - UMedia_dummy in 'Classes\UMedia_dummy.pas', - UVideo in 'Classes\UVideo.pas', + UMusic in 'Classes\UMusic.pas', + UMedia_dummy in 'Classes\UMedia_dummy.pas', + UVideo in 'Classes\UVideo.pas', +// UAudio_FFMpeg in 'Classes\UAudio_FFMpeg.pas', // this is NEARLY to a working point :P + UAudio_Bass in 'Classes\UAudio_Bass.pas', //------------------------------ //Includes - Screens @@ -330,6 +332,7 @@ begin Log.BenchmarkEnd(1); Log.LogBenchmark('Initializing Sound', 1); +// exit; // Graphics Log.BenchmarkStart(1); -- cgit v1.2.3 From 5802c7be05f25e5da3a991377942c00ee7d95639 Mon Sep 17 00:00:00 2001 From: whiteshark0 Date: Sat, 27 Oct 2007 09:36:49 +0000 Subject: try to fix build errors git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@537 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index 0b7e8449..81596deb 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -93,7 +93,7 @@ uses UCore in 'Classes\UCore.pas', //Core, Maybe remove this UCoreModule in 'Classes\UCoreModule.pas', //^ UPluginInterface in 'Classes\UPluginInterface.pas', //Interface offered by Core to Plugins - uPluginLoader in 'Classes\uPluginLoader.pas', //New Plugin Loader Module + UPluginLoader in 'Classes\UPluginLoader.pas', //New Plugin Loader Module UParty in 'Classes\UParty.pas', // to - do : rewrite Party Manager as Module, reomplent ability to offer party Mody by Plugin -- cgit v1.2.3 From e779d4f8a8ca13215895338f71e6929dc795cf60 Mon Sep 17 00:00:00 2001 From: whiteshark0 Date: Mon, 29 Oct 2007 15:40:07 +0000 Subject: Add new Party Modi SDK to Trunk git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@539 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 1 + 1 file changed, 1 insertion(+) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index 81596deb..536ef6be 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -154,6 +154,7 @@ uses //------------------------------ ModiSDK in '..\..\Modis\SDK\ModiSDK.pas', //Old SDK, will be deleted soon UPluginDefs in '..\..\Modis\SDK\UPluginDefs.pas', //New SDK, not only Modis + UPartyDefs in '..\..\Modis\SDK\UPartyDefs.pas', //Headers to register Party Modes Windows, SysUtils; -- cgit v1.2.3 From 391d30716d48dc709f6444b19c008e82311623b9 Mon Sep 17 00:00:00 2001 From: eddie-0815 Date: Thu, 1 Nov 2007 19:34:40 +0000 Subject: Mac OS X version compiles and links. I hope I didn't break too many files on windows/linux. Added switches.inc to all files. Changed many IFDEFs. For Windows-only code please use MSWINDOWS instead of WIN32 now. WIN32 is also used by the Mac port. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@546 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 250 +----------------------------------------------- 1 file changed, 5 insertions(+), 245 deletions(-) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index 536ef6be..80312bd1 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -158,250 +158,10 @@ uses Windows, SysUtils; - -const - Version = 'UltraStar Deluxe V 1.10 Alpha Build'; - -var - WndTitle: string; - hWnd: THandle; - I: Integer; + + // eddie: I had to move the main procedure to UMain.pas, because + // I can't use the dpr file with Xcode on the mac. begin - WndTitle := Version; - -// InitializeSound(); -// writeln( 'DONE' ); -// exit; - - - //------------------------------ - //Start more than One Time Prevention - //------------------------------ - hWnd:= FindWindow(nil, PChar(WndTitle)); - //Programm already started - if (hWnd <> 0) then - begin - I := Messagebox(0, PChar('Another Instance of Ultrastar is already running. Continue ?'), PChar(WndTitle), MB_ICONWARNING or MB_YESNO); - if (I = IDYes) then - begin - I := 1; - repeat - Inc(I); - hWnd := FindWindow(nil, PChar(WndTitle + ' Instance ' + InttoStr(I))); - until (hWnd = 0); - WndTitle := WndTitle + ' Instance ' + InttoStr(I); - end - else - Exit; - end; - - //------------------------------ - //StartUp - Create Classes and Load Files - //------------------------------ - USTime := TTime.Create; - - // Commandline Parameter Parser - Params := TCMDParams.Create; - - // Log + Benchmark - Log := TLog.Create; - Log.Title := WndTitle; - Log.Enabled := Not Params.NoLog; - Log.BenchmarkStart(0); - - // Language - Log.BenchmarkStart(1); - Log.LogStatus('Initialize Paths', 'Initialization'); InitializePaths; - Log.LogStatus('Load Language', 'Initialization'); Language := TLanguage.Create; - //Add Const Values: - Language.AddConst('US_VERSION', Version); - Log.BenchmarkEnd(1); - Log.LogBenchmark('Loading Language', 1); - - // SDL - Log.BenchmarkStart(1); - Log.LogStatus('Initialize SDL', 'Initialization'); - SDL_Init(SDL_INIT_VIDEO or SDL_INIT_AUDIO); - Log.BenchmarkEnd(1); - Log.LogBenchmark('Initializing SDL', 1); - - // SDL_ttf - Log.BenchmarkStart(1); - Log.LogStatus('Initialize SDL_ttf', 'Initialization'); - TTF_Init(); //ttf_quit(); - Log.BenchmarkEnd(1); - Log.LogBenchmark('Initializing SDL_ttf', 1); - - // Skin - Log.BenchmarkStart(1); - Log.LogStatus('Loading Skin List', 'Initialization'); Skin := TSkin.Create; - Log.BenchmarkEnd(1); - Log.LogBenchmark('Loading Skin List', 1); - - // Sound Card List - Log.BenchmarkStart(1); - Log.LogStatus('Loading Soundcard list', 'Initialization'); - Recording := TRecord.Create; - Log.BenchmarkEnd(1); - Log.LogBenchmark('Loading Soundcard list', 1); - - // Ini + Paths - Log.BenchmarkStart(1); - Log.LogStatus('Load Ini', 'Initialization'); Ini := TIni.Create; - Ini.Load; - - //Load Languagefile - if (Params.Language <> -1) then - Language.ChangeLanguage(ILanguage[Params.Language]) - else - Language.ChangeLanguage(ILanguage[Ini.Language]); - - Log.BenchmarkEnd(1); - Log.LogBenchmark('Loading Ini', 1); - - - // LCD - Log.BenchmarkStart(1); - Log.LogStatus('Load LCD', 'Initialization'); LCD := TLCD.Create; - if Ini.LPT = 1 then begin -// LCD.HalfInterface := true; - LCD.Enable; - LCD.Clear; - LCD.WriteText(1, ' UltraStar '); - LCD.WriteText(2, ' Loading... '); - end; - Log.BenchmarkEnd(1); - Log.LogBenchmark('Loading LCD', 1); - - // Light - Log.BenchmarkStart(1); - Log.LogStatus('Load Light', 'Initialization'); Light := TLight.Create; - if Ini.LPT = 2 then begin - Light.Enable; - end; - Log.BenchmarkEnd(1); - Log.LogBenchmark('Loading Light', 1); - - - - // Theme - Log.BenchmarkStart(1); - Log.LogStatus('Load Themes', 'Initialization'); Theme := TTheme.Create('Themes\' + ITheme[Ini.Theme] + '.ini', Ini.Color); - Log.BenchmarkEnd(1); - Log.LogBenchmark('Loading Themes', 1); - - // Covers Cache - Log.BenchmarkStart(1); - Log.LogStatus('Creating Covers Cache', 'Initialization'); Covers := TCovers.Create; - Log.LogBenchmark('Loading Covers Cache Array', 1); - Log.BenchmarkStart(1); - - // Category Covers - Log.BenchmarkStart(1); - Log.LogStatus('Creating Category Covers Array', 'Initialization'); - CatCovers:= TCatCovers.Create; - Log.BenchmarkEnd(1); - Log.LogBenchmark('Loading Category Covers Array', 1); - - // Songs - //Log.BenchmarkStart(1); - Log.LogStatus('Creating Song Array', 'Initialization'); Songs := TSongs.Create; - Songs.LoadSongList; - Log.LogStatus('Creating 2nd Song Array', 'Initialization'); CatSongs := TCatSongs.Create; - Log.BenchmarkEnd(1); - Log.LogBenchmark('Loading Songs', 1); - - // PluginManager - Log.BenchmarkStart(1); - Log.LogStatus('PluginManager', 'Initialization'); - DLLMan := TDLLMan.Create; //Load PluginList - Log.BenchmarkEnd(1); - Log.LogBenchmark('Loading PluginManager', 1); - - // Party Mode Manager - Log.BenchmarkStart(1); - Log.LogStatus('PartySession Manager', 'Initialization'); - PartySession := TParty_Session.Create; //Load PartySession - - Log.BenchmarkEnd(1); - Log.LogBenchmark('Loading PartySession Manager', 1); - - // Sound - Log.BenchmarkStart(1); - Log.LogStatus('Initialize Sound', 'Initialization'); InitializeSound(); - Log.BenchmarkEnd(1); - Log.LogBenchmark('Initializing Sound', 1); - -// exit; - - // Graphics - Log.BenchmarkStart(1); - Log.LogStatus('Initialize 3D', 'Initialization'); Initialize3D(WndTitle); - Log.BenchmarkEnd(1); - Log.LogBenchmark('Initializing 3D', 1); - - // Score Saving System - Log.BenchmarkStart(1); - Log.LogStatus('DataBase System', 'Initialization'); - DataBase := TDataBaseSystem.Create; - - if (Params.ScoreFile = '') then - DataBase.Init ('Ultrastar.db') - else - DataBase.Init (Params.ScoreFile); - - Log.BenchmarkEnd(1); - Log.LogBenchmark('Loading DataBase System', 1); - - //Playlist Manager - Log.BenchmarkStart(1); - Log.LogStatus('Playlist Manager', 'Initialization'); - PlaylistMan := TPlaylistManager.Create; - Log.BenchmarkEnd(1); - Log.LogBenchmark('Loading Playlist Manager', 1); - - //GoldenStarsTwinkleMod - Log.BenchmarkStart(1); - Log.LogStatus('Effect Manager', 'Initialization'); - GoldenRec := TEffectManager.Create; - Log.BenchmarkEnd(1); - Log.LogBenchmark('Loading Particel System', 1); - - // Joypad - 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; - - Log.BenchmarkEnd(0); - Log.LogBenchmark('Loading Time', 0); - - Log.LogError('Creating Core'); - Core := TCore.Create('Ultrastar Deluxe Beta', MakeVersion(1,1,0, chr(0))); - - Log.LogError('Running Core'); - Core.Run; - - //------------------------------ - //Start- Mainloop - //------------------------------ - //Music.SetLoop(true); - //Music.SetVolume(50); - //Music.Open(SkinPath + 'Menu Music 3.mp3'); - //Music.Play; - Log.LogStatus('Main Loop', 'Initialization'); MainLoop; - - //------------------------------ - //Finish Application - //------------------------------ - if Ini.LPT = 1 then LCD.Clear; - if Ini.LPT = 2 then Light.TurnOff; - - Log.LogStatus('Main Loop', 'Finished'); - - Log.Free; - -end. \ No newline at end of file + Main; +end. \ No newline at end of file -- cgit v1.2.3 From ae057627ff135d55891e9f04f399608fbc47e9ee Mon Sep 17 00:00:00 2001 From: jaybinks Date: Fri, 2 Nov 2007 12:16:50 +0000 Subject: Runtime Song Addition jira:USDX-157 git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@553 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index 80312bd1..2e04df9f 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -36,6 +36,8 @@ uses opt in 'lib\ffmpeg\opt.pas', avio in 'lib\ffmpeg\avio.pas', + DirWatch in 'lib\other\DirWatch.pas', + SQLiteTable3 in 'lib\SQLite\SQLiteTable3.pas', SQLite3 in 'lib\SQLite\SQLite3.pas', -- cgit v1.2.3 From 8c9c787a1326b90490543bd50b56fce9b89d9807 Mon Sep 17 00:00:00 2001 From: jaybinks Date: Sat, 3 Nov 2007 02:31:06 +0000 Subject: Windows Lazarus Build working again... Lazarus Project file includes the DPR, so that we have a unified Uses Clause ( keep this in mind please ) added "Delphi" to switches git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@560 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 291 +++++++++++++++++++++++++----------------------- 1 file changed, 152 insertions(+), 139 deletions(-) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index 2e04df9f..6d50fff4 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -1,169 +1,182 @@ +{$IFNDEF FPC} // This is here, so linux & MacOS X Versions can simply include the uses + // from the dpr. Saves dupicating the uses clause. program UltraStar; -{$R 'UltraStar.res' 'UltraStar.rc'} -{$I switches.inc} + {$R 'UltraStar.res' 'UltraStar.rc'} + {$I switches.inc} uses - //------------------------------ +{$ENDIF} + + //------------------------------ //Includes - 3rd Party Libraries //------------------------------ - 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', - sdl_image in 'lib\JEDI-SDLv1.0\SDL_Image\Pas\sdl_image.pas', - OpenGL12 in 'lib\JEDI-SDLv1.0\OpenGL\Pas\OpenGL12.pas', - sdl_ttf in 'lib\JEDI-SDLv1.0\SDL_ttf\Pas\sdl_ttf.pas', - - bass in 'lib\bass\delphi\bass.pas', - - PNGImage in 'lib\PNGImage\PNGImage.pas', - PNGzLib in 'lib\PNGImage\PNGzLib.pas', - pnglang in 'lib\PNGImage\pnglang.pas', - - midiout in 'lib\midi\midiout.pas', - midiin in 'lib\midi\midiin.pas', - CIRCBUF in 'lib\midi\CIRCBUF.PAS', - MidiType in 'lib\midi\MidiType.PAS', - MidiDefs in 'lib\midi\MidiDefs.PAS', - MidiCons in 'lib\midi\MidiCons.PAS', - MidiFile in 'lib\midi\MidiFile.PAS', - Delphmcb in 'lib\midi\Delphmcb.PAS', - - avcodec in 'lib\ffmpeg\avcodec.pas', - avformat in 'lib\ffmpeg\avformat.pas', - avutil in 'lib\ffmpeg\avutil.pas', - rational in 'lib\ffmpeg\rational.pas', - opt in 'lib\ffmpeg\opt.pas', - avio in 'lib\ffmpeg\avio.pas', - - DirWatch in 'lib\other\DirWatch.pas', - - SQLiteTable3 in 'lib\SQLite\SQLiteTable3.pas', - SQLite3 in 'lib\SQLite\SQLite3.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', + sdl_image in 'lib\JEDI-SDLv1.0\SDL_Image\Pas\sdl_image.pas', + OpenGL12 in 'lib\JEDI-SDLv1.0\OpenGL\Pas\OpenGL12.pas', + sdl_ttf in 'lib\JEDI-SDLv1.0\SDL_ttf\Pas\sdl_ttf.pas', + + bass in 'lib\bass\delphi\bass.pas', + + {$ifdef delphi} + midiout in 'lib\midi\midiout.pas', + midiin in 'lib\midi\midiin.pas', + CIRCBUF in 'lib\midi\CIRCBUF.PAS', + MidiType in 'lib\midi\MidiType.PAS', + MidiDefs in 'lib\midi\MidiDefs.PAS', + MidiCons in 'lib\midi\MidiCons.PAS', + MidiFile in 'lib\midi\MidiFile.PAS', + Delphmcb in 'lib\midi\Delphmcb.PAS', + + DirWatch in 'lib\other\DirWatch.pas', + {$endif} + + avcodec in 'lib\ffmpeg\avcodec.pas', + avformat in 'lib\ffmpeg\avformat.pas', + avutil in 'lib\ffmpeg\avutil.pas', + rational in 'lib\ffmpeg\rational.pas', + opt in 'lib\ffmpeg\opt.pas', + avio in 'lib\ffmpeg\avio.pas', + + + SQLiteTable3 in 'lib\SQLite\SQLiteTable3.pas', + SQLite3 in 'lib\SQLite\SQLite3.pas', - //------------------------------ + //------------------------------ //Includes - Menu System //------------------------------ - UDisplay in 'Menu\UDisplay.pas', - UMenu in 'Menu\UMenu.pas', - UMenuStatic in 'Menu\UMenuStatic.pas', - UMenuText in 'Menu\UMenuText.pas', - UMenuButton in 'Menu\UMenuButton.pas', - UMenuInteract in 'Menu\UMenuInteract.pas', - UMenuSelect in 'Menu\UMenuSelect.pas', - UMenuSelectSlide in 'Menu\UMenuSelectSlide.pas', - UDrawTexture in 'Menu\UDrawTexture.pas', - UMenuButtonCollection in 'Menu\UMenuButtonCollection.pas', + UDisplay in 'Menu\UDisplay.pas', + UMenu in 'Menu\UMenu.pas', + UMenuStatic in 'Menu\UMenuStatic.pas', + UMenuText in 'Menu\UMenuText.pas', + UMenuButton in 'Menu\UMenuButton.pas', + UMenuInteract in 'Menu\UMenuInteract.pas', + UMenuSelect in 'Menu\UMenuSelect.pas', + UMenuSelectSlide in 'Menu\UMenuSelectSlide.pas', + UDrawTexture in 'Menu\UDrawTexture.pas', + UMenuButtonCollection in 'Menu\UMenuButtonCollection.pas', - //------------------------------ - //Includes - Classes //------------------------------ - UCommon in 'Classes\UCommon.pas', - UGraphic in 'Classes\UGraphic.pas', - UTexture in 'Classes\UTexture.pas', - ULanguage in 'Classes\ULanguage.pas', - UMain in 'Classes\UMain.pas', - UDraw in 'Classes\UDraw.pas', - URecord in 'Classes\URecord.pas', - UTime in 'Classes\UTime.pas', - TextGL in 'Classes\TextGL.pas', - USongs in 'Classes\USongs.pas', - UIni in 'Classes\UIni.pas', - ULyrics in 'Classes\ULyrics.pas', - ULyrics_bak in 'Classes\ULyrics_bak.pas', - USkins in 'Classes\USkins.pas', - UThemes in 'Classes\UThemes.pas', - ULog in 'Classes\ULog.pas', - UJoystick in 'Classes\UJoystick.pas', - ULCD in 'Classes\ULCD.pas', - ULight in 'Classes\ULight.pas', - UDataBase in 'Classes\UDataBase.pas', - UCovers in 'Classes\UCovers.pas', - UCatCovers in 'Classes\UCatCovers.pas', - UFiles in 'Classes\UFiles.pas', - UGraphicClasses in 'Classes\UGraphicClasses.pas', - UDLLManager in 'Classes\UDLLManager.pas', - UPlaylist in 'Classes\UPlaylist.pas', - UCommandLine in 'Classes\UCommandLine.pas', - UTextClasses in 'Classes\UTextClasses.pas', - USingScores in 'Classes\USingScores.pas', - USingNotes in 'Classes\USingNotes.pas', - - UModules in 'Classes\UModules.pas', //List of Modules to Load - UHooks in 'Classes\UHooks.pas', //Hook Managing - UServices in 'Classes\UServices.pas',//Service Managing - UCore in 'Classes\UCore.pas', //Core, Maybe remove this - UCoreModule in 'Classes\UCoreModule.pas', //^ - UPluginInterface in 'Classes\UPluginInterface.pas', //Interface offered by Core to Plugins - UPluginLoader in 'Classes\UPluginLoader.pas', //New Plugin Loader Module - - UParty in 'Classes\UParty.pas', // to - do : rewrite Party Manager as Module, reomplent ability to offer party Mody by Plugin + //Includes - Classes + //------------------------------ + UCommon in 'Classes\UCommon.pas', + UGraphic in 'Classes\UGraphic.pas', + UTexture in 'Classes\UTexture.pas', + ULanguage in 'Classes\ULanguage.pas', + UMain in 'Classes\UMain.pas', + UDraw in 'Classes\UDraw.pas', + URecord in 'Classes\URecord.pas', + UTime in 'Classes\UTime.pas', + TextGL in 'Classes\TextGL.pas', + USongs in 'Classes\USongs.pas', + UIni in 'Classes\UIni.pas', + ULyrics in 'Classes\ULyrics.pas', + ULyrics_bak in 'Classes\ULyrics_bak.pas', + USkins in 'Classes\USkins.pas', + UThemes in 'Classes\UThemes.pas', + ULog in 'Classes\ULog.pas', + UJoystick in 'Classes\UJoystick.pas', + ULCD in 'Classes\ULCD.pas', + ULight in 'Classes\ULight.pas', + UDataBase in 'Classes\UDataBase.pas', + UCovers in 'Classes\UCovers.pas', + UCatCovers in 'Classes\UCatCovers.pas', + UFiles in 'Classes\UFiles.pas', + UGraphicClasses in 'Classes\UGraphicClasses.pas', + UDLLManager in 'Classes\UDLLManager.pas', + UPlaylist in 'Classes\UPlaylist.pas', + UCommandLine in 'Classes\UCommandLine.pas', + UTextClasses in 'Classes\UTextClasses.pas', + USingScores in 'Classes\USingScores.pas', + USingNotes in 'Classes\USingNotes.pas', + + UModules in 'Classes\UModules.pas', //List of Modules to Load + UHooks in 'Classes\UHooks.pas', //Hook Managing + UServices in 'Classes\UServices.pas', //Service Managing + UCore in 'Classes\UCore.pas', //Core, Maybe remove this + UCoreModule in 'Classes\UCoreModule.pas', //^ + UPluginInterface in 'Classes\UPluginInterface.pas', //Interface offered by Core to Plugins + UPluginLoader in 'Classes\UPluginLoader.pas', //New Plugin Loader Module + + UParty in 'Classes\UParty.pas', // to - do : rewrite Party Manager as Module, reomplent ability to offer party Mody by Plugin + +{$IFDEF FPC} + ulazjpeg in 'Classes\Ulazjpeg.pas', +{$ENDIF} + //------------------------------ //Includes - Media support classes.... // Make sure UMedia always first, then UMedia_dummy //------------------------------ - UMusic in 'Classes\UMusic.pas', - UMedia_dummy in 'Classes\UMedia_dummy.pas', - UVideo in 'Classes\UVideo.pas', -// UAudio_FFMpeg in 'Classes\UAudio_FFMpeg.pas', // this is NEARLY to a working point :P - UAudio_Bass in 'Classes\UAudio_Bass.pas', + UMusic in 'Classes\UMusic.pas', + UMedia_dummy in 'Classes\UMedia_dummy.pas', + UVideo in 'Classes\UVideo.pas', +{$ifdef linux} + UAudio_FFMpeg in 'Classes\UAudio_FFMpeg.pas', +{$endif} +{$ifdef win32} + UAudio_bass in 'Classes\UAudio_bass.pas', +{$endif} - //------------------------------ - //Includes - Screens //------------------------------ - UScreenLoading in 'Screens\UScreenLoading.pas', - UScreenWelcome in 'Screens\UScreenWelcome.pas', - UScreenMain in 'Screens\UScreenMain.pas', - UScreenName in 'Screens\UScreenName.pas', - UScreenLevel in 'Screens\UScreenLevel.pas', - UScreenSong in 'Screens\UScreenSong.pas', - UScreenSing in 'Screens\UScreenSing.pas', - UScreenScore in 'Screens\UScreenScore.pas', - UScreenOptions in 'Screens\UScreenOptions.pas', - UScreenOptionsGame in 'Screens\UScreenOptionsGame.pas', - UScreenOptionsGraphics in 'Screens\UScreenOptionsGraphics.pas', - UScreenOptionsSound in 'Screens\UScreenOptionsSound.pas', - UScreenOptionsLyrics in 'Screens\UScreenOptionsLyrics.pas', - UScreenOptionsThemes in 'Screens\UScreenOptionsThemes.pas', - UScreenOptionsRecord in 'Screens\UScreenOptionsRecord.pas', - UScreenOptionsAdvanced in 'Screens\UScreenOptionsAdvanced.pas', - UScreenEditSub in 'Screens\UScreenEditSub.pas', - UScreenEdit in 'Screens\UScreenEdit.pas', - UScreenEditConvert in 'Screens\UScreenEditConvert.pas', - UScreenEditHeader in 'Screens\UScreenEditHeader.pas', - UScreenOpen in 'Screens\UScreenOpen.pas', - UScreenTop5 in 'Screens\UScreenTop5.pas', - UScreenSongMenu in 'Screens\UScreenSongMenu.pas', - UScreenSongJumpto in 'Screens\UScreenSongJumpto.pas', - UScreenStatMain in 'Screens\UScreenStatMain.pas', - UScreenStatDetail in 'Screens\UScreenStatDetail.pas', - UScreenCredits in 'Screens\UScreenCredits.pas', - UScreenPopup in 'Screens\UScreenPopup.pas', + //Includes - Screens + //------------------------------ + UScreenLoading in 'Screens\UScreenLoading.pas', + UScreenWelcome in 'Screens\UScreenWelcome.pas', + UScreenMain in 'Screens\UScreenMain.pas', + UScreenName in 'Screens\UScreenName.pas', + UScreenLevel in 'Screens\UScreenLevel.pas', + UScreenSong in 'Screens\UScreenSong.pas', + UScreenSing in 'Screens\UScreenSing.pas', + UScreenScore in 'Screens\UScreenScore.pas', + UScreenOptions in 'Screens\UScreenOptions.pas', + UScreenOptionsGame in 'Screens\UScreenOptionsGame.pas', + UScreenOptionsGraphics in 'Screens\UScreenOptionsGraphics.pas', + UScreenOptionsSound in 'Screens\UScreenOptionsSound.pas', + UScreenOptionsLyrics in 'Screens\UScreenOptionsLyrics.pas', + UScreenOptionsThemes in 'Screens\UScreenOptionsThemes.pas', + UScreenOptionsRecord in 'Screens\UScreenOptionsRecord.pas', + UScreenOptionsAdvanced in 'Screens\UScreenOptionsAdvanced.pas', + UScreenEditSub in 'Screens\UScreenEditSub.pas', + UScreenEdit in 'Screens\UScreenEdit.pas', + UScreenEditConvert in 'Screens\UScreenEditConvert.pas', + UScreenEditHeader in 'Screens\UScreenEditHeader.pas', + UScreenOpen in 'Screens\UScreenOpen.pas', + UScreenTop5 in 'Screens\UScreenTop5.pas', + UScreenSongMenu in 'Screens\UScreenSongMenu.pas', + UScreenSongJumpto in 'Screens\UScreenSongJumpto.pas', + UScreenStatMain in 'Screens\UScreenStatMain.pas', + UScreenStatDetail in 'Screens\UScreenStatDetail.pas', + UScreenCredits in 'Screens\UScreenCredits.pas', + UScreenPopup in 'Screens\UScreenPopup.pas', - //------------------------------ //Includes - Screens PartyMode - //------------------------------ - UScreenSingModi in 'Screens\UScreenSingModi.pas', - UScreenPartyNewRound in 'Screens\UScreenPartyNewRound.pas', - UScreenPartyScore in 'Screens\UScreenPartyScore.pas', - UScreenPartyPlayer in 'Screens\UScreenPartyPlayer.pas', - UScreenPartyOptions in 'Screens\UScreenPartyOptions.pas', - UScreenPartyWin in 'Screens\UScreenPartyWin.pas', + UScreenSingModi in 'Screens\UScreenSingModi.pas', + UScreenPartyNewRound in 'Screens\UScreenPartyNewRound.pas', + UScreenPartyScore in 'Screens\UScreenPartyScore.pas', + UScreenPartyPlayer in 'Screens\UScreenPartyPlayer.pas', + UScreenPartyOptions in 'Screens\UScreenPartyOptions.pas', + UScreenPartyWin in 'Screens\UScreenPartyWin.pas', + //------------------------------ //Includes - Modi SDK //------------------------------ - ModiSDK in '..\..\Modis\SDK\ModiSDK.pas', //Old SDK, will be deleted soon - UPluginDefs in '..\..\Modis\SDK\UPluginDefs.pas', //New SDK, not only Modis - UPartyDefs in '..\..\Modis\SDK\UPartyDefs.pas', //Headers to register Party Modes + ModiSDK in '..\..\Modis\SDK\ModiSDK.pas', //Old SDK, will be deleted soon + UPluginDefs in '..\..\Modis\SDK\UPluginDefs.pas', //New SDK, not only Modis + UPartyDefs in '..\..\Modis\SDK\UPartyDefs.pas', //Headers to register Party Modes Windows, SysUtils; - - // eddie: I had to move the main procedure to UMain.pas, because - // I can't use the dpr file with Xcode on the mac. +const + Version = 'UltraStar Deluxe V 1.10 Alpha Build'; + +{$IFNDEF FPC} begin Main; -end. \ No newline at end of file +end. +{$ENDIF} \ No newline at end of file -- cgit v1.2.3 From cd4710574dd911e9f82586b093c10758693bfc3e Mon Sep 17 00:00:00 2001 From: jaybinks Date: Sat, 3 Nov 2007 03:11:24 +0000 Subject: attempt to fix linux build. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@561 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index 6d50fff4..3ece5395 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -11,12 +11,12 @@ uses //------------------------------ //Includes - 3rd Party Libraries //------------------------------ - 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', - sdl_image in 'lib\JEDI-SDLv1.0\SDL_Image\Pas\sdl_image.pas', - OpenGL12 in 'lib\JEDI-SDLv1.0\OpenGL\Pas\OpenGL12.pas', - sdl_ttf in 'lib\JEDI-SDLv1.0\SDL_ttf\Pas\sdl_ttf.pas', + moduleloader in 'lib\JEDI-SDLv1.0\SDL\Pas\moduleloader.pas', + opengl12 in 'lib\JEDI-SDLv1.0\OpenGL\Pas\opengl12.pas', + sdl in 'lib\JEDI-SDLv1.0\SDL\Pas\sdl.pas', + sdl_image in 'lib\JEDI-SDLv1.0\SDL_Image\Pas\sdl_image.pas', + sdl_ttf in 'lib\JEDI-SDLv1.0\SDL_ttf\Pas\sdl_ttf.pas', + sdlutils in 'lib\JEDI-SDLv1.0\SDL\Pas\sdlutils.pas', bass in 'lib\bass\delphi\bass.pas', -- cgit v1.2.3 From 85313ec4dcc1591dbf1ecf6fa76294080354ed2a Mon Sep 17 00:00:00 2001 From: jaybinks Date: Sat, 3 Nov 2007 03:13:44 +0000 Subject: another attempt.. ( me to lazy to boot my linux dev box .. ) git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@562 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index 3ece5395..4695ae4e 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -18,9 +18,9 @@ uses sdl_ttf in 'lib\JEDI-SDLv1.0\SDL_ttf\Pas\sdl_ttf.pas', sdlutils in 'lib\JEDI-SDLv1.0\SDL\Pas\sdlutils.pas', + {$ifdef delphi} bass in 'lib\bass\delphi\bass.pas', - {$ifdef delphi} midiout in 'lib\midi\midiout.pas', midiin in 'lib\midi\midiin.pas', CIRCBUF in 'lib\midi\CIRCBUF.PAS', -- cgit v1.2.3 From 8d021ba9197cc31408c4a9da1948422bcb7a3d43 Mon Sep 17 00:00:00 2001 From: jaybinks Date: Sat, 3 Nov 2007 03:30:35 +0000 Subject: 1 more try. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@563 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index 4695ae4e..0ab28cb6 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -98,7 +98,7 @@ uses UCore in 'Classes\UCore.pas', //Core, Maybe remove this UCoreModule in 'Classes\UCoreModule.pas', //^ UPluginInterface in 'Classes\UPluginInterface.pas', //Interface offered by Core to Plugins - UPluginLoader in 'Classes\UPluginLoader.pas', //New Plugin Loader Module + uPluginLoader in 'Classes\uPluginLoader.pas', //New Plugin Loader Module UParty in 'Classes\UParty.pas', // to - do : rewrite Party Manager as Module, reomplent ability to offer party Mody by Plugin @@ -169,7 +169,9 @@ uses UPluginDefs in '..\..\Modis\SDK\UPluginDefs.pas', //New SDK, not only Modis UPartyDefs in '..\..\Modis\SDK\UPartyDefs.pas', //Headers to register Party Modes + {$IFDEF win32} Windows, + {$ENDIF} SysUtils; const -- cgit v1.2.3 From a0ff0b75e3562e04f17f11fc41f2e49040d620c5 Mon Sep 17 00:00:00 2001 From: eddie-0815 Date: Thu, 8 Nov 2007 21:02:07 +0000 Subject: Added UPlatform.pas. This should be the first step to move the simple platform specific code to one file for each platform to reduce the IFDEFs in the remaining files. The first available function is a unicode capable DirectoryFindFiles. It is now used in the BrowseDir function in file USongs.pas. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@595 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index 0ab28cb6..fcc56d33 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -101,9 +101,16 @@ uses uPluginLoader in 'Classes\uPluginLoader.pas', //New Plugin Loader Module UParty in 'Classes\UParty.pas', // to - do : rewrite Party Manager as Module, reomplent ability to offer party Mody by Plugin + UPlatform in 'Classes\UPlatform.pas', +{$IFDEF WIN32} + UPlatformWindows in 'Classes\UPlatformWindows.pas', +{$ENDIF} +{$IFDEF LINUX} + UPlatformLinux in 'Classes\UPlatformLinux.pas', +{$ENDIF} {$IFDEF FPC} - ulazjpeg in 'Classes\Ulazjpeg.pas', + ulazjpeg in 'Classes\Ulazjpeg.pas', {$ENDIF} -- cgit v1.2.3 From 4b6577b5988fe3551ce126bb2b1ca91e612015b5 Mon Sep 17 00:00:00 2001 From: tobigun Date: Wed, 5 Dec 2007 22:22:01 +0000 Subject: portaudio support added git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@675 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index fcc56d33..e5ace11e 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -18,9 +18,17 @@ uses sdl_ttf in 'lib\JEDI-SDLv1.0\SDL_ttf\Pas\sdl_ttf.pas', sdlutils in 'lib\JEDI-SDLv1.0\SDL\Pas\sdlutils.pas', - {$ifdef delphi} + {$ifdef UseBass} bass in 'lib\bass\delphi\bass.pas', + {$endif} + {$ifdef UsePortAudio} + portaudio in 'lib\portaudio\delphi\portaudio.pas', + {$endif} + {$ifdef UsePortmixer} + portmixer in 'lib\portmixer\delphi\portmixer.pas', + {$endif} + {$ifdef delphi} midiout in 'lib\midi\midiout.pas', midiin in 'lib\midi\midiin.pas', CIRCBUF in 'lib\midi\CIRCBUF.PAS', @@ -39,7 +47,7 @@ uses rational in 'lib\ffmpeg\rational.pas', opt in 'lib\ffmpeg\opt.pas', avio in 'lib\ffmpeg\avio.pas', - + //swscale in 'lib\ffmpeg\swscale.pas', SQLiteTable3 in 'lib\SQLite\SQLiteTable3.pas', SQLite3 in 'lib\SQLite\SQLite3.pas', @@ -106,7 +114,7 @@ uses UPlatformWindows in 'Classes\UPlatformWindows.pas', {$ENDIF} {$IFDEF LINUX} - UPlatformLinux in 'Classes\UPlatformLinux.pas', + UPlatformLinux in 'Classes\UPlatformLinux.pas', {$ENDIF} {$IFDEF FPC} @@ -121,12 +129,15 @@ uses UMusic in 'Classes\UMusic.pas', UMedia_dummy in 'Classes\UMedia_dummy.pas', UVideo in 'Classes\UVideo.pas', -{$ifdef linux} - UAudio_FFMpeg in 'Classes\UAudio_FFMpeg.pas', -{$endif} -{$ifdef win32} +{$ifdef UseBass} UAudio_bass in 'Classes\UAudio_bass.pas', {$endif} +{$ifdef UsePortaudio} + UAudio_portaudio in 'Classes\UAudio_portaudio.pas', +{$endif} +{$ifdef FFMpegAudio} + UAudio_FFMpeg in 'Classes\UAudio_FFMpeg.pas', +{$endif} //------------------------------ //Includes - Screens @@ -188,4 +199,4 @@ const begin Main; end. -{$ENDIF} \ No newline at end of file +{$ENDIF} -- cgit v1.2.3 From 486ad8796acc5883ef83f3a78cd615f6711d77f0 Mon Sep 17 00:00:00 2001 From: jaybinks Date: Thu, 6 Dec 2007 09:39:49 +0000 Subject: conformed projectM to IVideoPlayback still needs a little work. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@678 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index e5ace11e..6a1d0013 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -128,7 +128,7 @@ uses //------------------------------ UMusic in 'Classes\UMusic.pas', UMedia_dummy in 'Classes\UMedia_dummy.pas', - UVideo in 'Classes\UVideo.pas', +// UVideo in 'Classes\UVideo.pas', {$ifdef UseBass} UAudio_bass in 'Classes\UAudio_bass.pas', {$endif} @@ -139,6 +139,9 @@ uses UAudio_FFMpeg in 'Classes\UAudio_FFMpeg.pas', {$endif} + projectM in 'lib\projectM\projectM.pas', + UVisualizer in 'Classes\UVisualizer.pas', + //------------------------------ //Includes - Screens //------------------------------ -- cgit v1.2.3 From 27ca028ea19879bb3b109c58bae86b61e60b3370 Mon Sep 17 00:00:00 2001 From: tobigun Date: Thu, 6 Dec 2007 10:40:15 +0000 Subject: Visualizer changes (audio connection, some opengl fixes) git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@679 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index 6a1d0013..49ba145d 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -49,9 +49,14 @@ uses avio in 'lib\ffmpeg\avio.pas', //swscale in 'lib\ffmpeg\swscale.pas', + {$ifdef UseProjectM} + projectM in 'lib\projectM\projectM.pas', + {$endif} + SQLiteTable3 in 'lib\SQLite\SQLiteTable3.pas', SQLite3 in 'lib\SQLite\SQLite3.pas', + //------------------------------ //Includes - Menu System //------------------------------ @@ -68,7 +73,7 @@ uses //------------------------------ //Includes - Classes - //------------------------------ + //------------------------------ UCommon in 'Classes\UCommon.pas', UGraphic in 'Classes\UGraphic.pas', UTexture in 'Classes\UTexture.pas', @@ -109,9 +114,9 @@ uses uPluginLoader in 'Classes\uPluginLoader.pas', //New Plugin Loader Module UParty in 'Classes\UParty.pas', // to - do : rewrite Party Manager as Module, reomplent ability to offer party Mody by Plugin - UPlatform in 'Classes\UPlatform.pas', + UPlatform in 'Classes\UPlatform.pas', {$IFDEF WIN32} - UPlatformWindows in 'Classes\UPlatformWindows.pas', + UPlatformWindows in 'Classes\UPlatformWindows.pas', {$ENDIF} {$IFDEF LINUX} UPlatformLinux in 'Classes\UPlatformLinux.pas', @@ -139,8 +144,9 @@ uses UAudio_FFMpeg in 'Classes\UAudio_FFMpeg.pas', {$endif} - projectM in 'lib\projectM\projectM.pas', - UVisualizer in 'Classes\UVisualizer.pas', +{$IFDEF UseProjectM} + UVisualizer in 'Classes\UVisualizer.pas', +{$ENDIF} //------------------------------ //Includes - Screens -- cgit v1.2.3 From d3f1d5ec15ea7dae7252f9b71e2659dd94ee2075 Mon Sep 17 00:00:00 2001 From: jaybinks Date: Thu, 6 Dec 2007 11:48:37 +0000 Subject: git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@685 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index 49ba145d..82dab1c7 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -133,7 +133,7 @@ uses //------------------------------ UMusic in 'Classes\UMusic.pas', UMedia_dummy in 'Classes\UMedia_dummy.pas', -// UVideo in 'Classes\UVideo.pas', + UVideo in 'Classes\UVideo.pas', {$ifdef UseBass} UAudio_bass in 'Classes\UAudio_bass.pas', {$endif} -- cgit v1.2.3 From be68ff31e2d10d5f29894c6ec4ed877c70c142a3 Mon Sep 17 00:00:00 2001 From: jaybinks Date: Thu, 6 Dec 2007 12:26:05 +0000 Subject: gave priority to videos over Visualization... so now video plays back... and "V" will switch between Video ( or jpg ) background and visualization. this needs to be pressed on every song, as the state should be forgotten. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@687 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index 82dab1c7..6394113a 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -133,6 +133,9 @@ uses //------------------------------ UMusic in 'Classes\UMusic.pas', UMedia_dummy in 'Classes\UMedia_dummy.pas', +{$IFDEF UseProjectM} + UVisualizer in 'Classes\UVisualizer.pas', // MUST be before Video... +{$ENDIF} UVideo in 'Classes\UVideo.pas', {$ifdef UseBass} UAudio_bass in 'Classes\UAudio_bass.pas', @@ -144,9 +147,6 @@ uses UAudio_FFMpeg in 'Classes\UAudio_FFMpeg.pas', {$endif} -{$IFDEF UseProjectM} - UVisualizer in 'Classes\UVisualizer.pas', -{$ENDIF} //------------------------------ //Includes - Screens -- cgit v1.2.3 From 011d12dd56e5c18e08c311e880d010e73674a029 Mon Sep 17 00:00:00 2001 From: jaybinks Date: Thu, 6 Dec 2007 12:31:25 +0000 Subject: added some comments git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@688 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index 6394113a..bd8c42ac 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -131,10 +131,12 @@ uses //Includes - Media support classes.... // Make sure UMedia always first, then UMedia_dummy //------------------------------ + + // TODO : these all need to be renamed like UMedia_******** for consistency UMusic in 'Classes\UMusic.pas', - UMedia_dummy in 'Classes\UMedia_dummy.pas', + UMedia_dummy in 'Classes\UMedia_dummy.pas', // Must be first UMedia Unit, all others will override available interfaces {$IFDEF UseProjectM} - UVisualizer in 'Classes\UVisualizer.pas', // MUST be before Video... + UVisualizer in 'Classes\UVisualizer.pas', // MUST be before Video... so video can override... {$ENDIF} UVideo in 'Classes\UVideo.pas', {$ifdef UseBass} -- cgit v1.2.3 From 06b754fdbc1bad124b6057d06056a1233d910933 Mon Sep 17 00:00:00 2001 From: tobigun Date: Mon, 17 Dec 2007 11:28:03 +0000 Subject: - changed compiler-switch FFMpegAudio to UseFFMpegAudio - UseProjectM splitted into UseProjectM_0_9 or UseProjectM_1_0 git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@710 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index bd8c42ac..7b0b85a8 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -16,7 +16,7 @@ uses sdl in 'lib\JEDI-SDLv1.0\SDL\Pas\sdl.pas', sdl_image in 'lib\JEDI-SDLv1.0\SDL_Image\Pas\sdl_image.pas', sdl_ttf in 'lib\JEDI-SDLv1.0\SDL_ttf\Pas\sdl_ttf.pas', - sdlutils in 'lib\JEDI-SDLv1.0\SDL\Pas\sdlutils.pas', + sdlutils in 'lib\JEDI-SDLv1.0\SDL\Pas\sdlutils.pas', {$ifdef UseBass} bass in 'lib\bass\delphi\bass.pas', @@ -49,8 +49,11 @@ uses avio in 'lib\ffmpeg\avio.pas', //swscale in 'lib\ffmpeg\swscale.pas', - {$ifdef UseProjectM} - projectM in 'lib\projectM\projectM.pas', + {$ifdef UseProjectM_0_9} + projectM in 'lib\projectM\0.9\projectM.pas', + {$endif} + {$ifdef UseProjectM_1_0} + projectM in 'lib\projectM\1.0\projectM.pas', {$endif} SQLiteTable3 in 'lib\SQLite\SQLiteTable3.pas', @@ -145,7 +148,7 @@ uses {$ifdef UsePortaudio} UAudio_portaudio in 'Classes\UAudio_portaudio.pas', {$endif} -{$ifdef FFMpegAudio} +{$ifdef UseFFMpegAudio} UAudio_FFMpeg in 'Classes\UAudio_FFMpeg.pas', {$endif} -- cgit v1.2.3 From 29214cceb54e4683811186e1280a53509f2e888a Mon Sep 17 00:00:00 2001 From: b1indy Date: Mon, 17 Dec 2007 15:50:07 +0000 Subject: include swscale.pas git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@713 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index 7b0b85a8..9ba415bc 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -47,7 +47,7 @@ uses rational in 'lib\ffmpeg\rational.pas', opt in 'lib\ffmpeg\opt.pas', avio in 'lib\ffmpeg\avio.pas', - //swscale in 'lib\ffmpeg\swscale.pas', + swscale in 'lib\ffmpeg\swscale.pas', {$ifdef UseProjectM_0_9} projectM in 'lib\projectM\0.9\projectM.pas', -- cgit v1.2.3 From bbda88716432ec68fd686438d291b41f918dc4af Mon Sep 17 00:00:00 2001 From: jaybinks Date: Tue, 18 Dec 2007 02:25:24 +0000 Subject: git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@719 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 432 ++++++++++++++++++++++++------------------------ 1 file changed, 216 insertions(+), 216 deletions(-) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index 9ba415bc..b442b3bc 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -1,216 +1,216 @@ -{$IFNDEF FPC} // This is here, so linux & MacOS X Versions can simply include the uses - // from the dpr. Saves dupicating the uses clause. -program UltraStar; - - {$R 'UltraStar.res' 'UltraStar.rc'} - {$I switches.inc} - -uses -{$ENDIF} - - //------------------------------ - //Includes - 3rd Party Libraries - //------------------------------ - moduleloader in 'lib\JEDI-SDLv1.0\SDL\Pas\moduleloader.pas', - opengl12 in 'lib\JEDI-SDLv1.0\OpenGL\Pas\opengl12.pas', - sdl in 'lib\JEDI-SDLv1.0\SDL\Pas\sdl.pas', - sdl_image in 'lib\JEDI-SDLv1.0\SDL_Image\Pas\sdl_image.pas', - sdl_ttf in 'lib\JEDI-SDLv1.0\SDL_ttf\Pas\sdl_ttf.pas', - sdlutils in 'lib\JEDI-SDLv1.0\SDL\Pas\sdlutils.pas', - - {$ifdef UseBass} - bass in 'lib\bass\delphi\bass.pas', - {$endif} - {$ifdef UsePortAudio} - portaudio in 'lib\portaudio\delphi\portaudio.pas', - {$endif} - {$ifdef UsePortmixer} - portmixer in 'lib\portmixer\delphi\portmixer.pas', - {$endif} - - {$ifdef delphi} - midiout in 'lib\midi\midiout.pas', - midiin in 'lib\midi\midiin.pas', - CIRCBUF in 'lib\midi\CIRCBUF.PAS', - MidiType in 'lib\midi\MidiType.PAS', - MidiDefs in 'lib\midi\MidiDefs.PAS', - MidiCons in 'lib\midi\MidiCons.PAS', - MidiFile in 'lib\midi\MidiFile.PAS', - Delphmcb in 'lib\midi\Delphmcb.PAS', - - DirWatch in 'lib\other\DirWatch.pas', - {$endif} - - avcodec in 'lib\ffmpeg\avcodec.pas', - avformat in 'lib\ffmpeg\avformat.pas', - avutil in 'lib\ffmpeg\avutil.pas', - rational in 'lib\ffmpeg\rational.pas', - opt in 'lib\ffmpeg\opt.pas', - avio in 'lib\ffmpeg\avio.pas', - swscale in 'lib\ffmpeg\swscale.pas', - - {$ifdef UseProjectM_0_9} - projectM in 'lib\projectM\0.9\projectM.pas', - {$endif} - {$ifdef UseProjectM_1_0} - projectM in 'lib\projectM\1.0\projectM.pas', - {$endif} - - SQLiteTable3 in 'lib\SQLite\SQLiteTable3.pas', - SQLite3 in 'lib\SQLite\SQLite3.pas', - - - //------------------------------ - //Includes - Menu System - //------------------------------ - UDisplay in 'Menu\UDisplay.pas', - UMenu in 'Menu\UMenu.pas', - UMenuStatic in 'Menu\UMenuStatic.pas', - UMenuText in 'Menu\UMenuText.pas', - UMenuButton in 'Menu\UMenuButton.pas', - UMenuInteract in 'Menu\UMenuInteract.pas', - UMenuSelect in 'Menu\UMenuSelect.pas', - UMenuSelectSlide in 'Menu\UMenuSelectSlide.pas', - UDrawTexture in 'Menu\UDrawTexture.pas', - UMenuButtonCollection in 'Menu\UMenuButtonCollection.pas', - - //------------------------------ - //Includes - Classes - //------------------------------ - UCommon in 'Classes\UCommon.pas', - UGraphic in 'Classes\UGraphic.pas', - UTexture in 'Classes\UTexture.pas', - ULanguage in 'Classes\ULanguage.pas', - UMain in 'Classes\UMain.pas', - UDraw in 'Classes\UDraw.pas', - URecord in 'Classes\URecord.pas', - UTime in 'Classes\UTime.pas', - TextGL in 'Classes\TextGL.pas', - USongs in 'Classes\USongs.pas', - UIni in 'Classes\UIni.pas', - ULyrics in 'Classes\ULyrics.pas', - ULyrics_bak in 'Classes\ULyrics_bak.pas', - USkins in 'Classes\USkins.pas', - UThemes in 'Classes\UThemes.pas', - ULog in 'Classes\ULog.pas', - UJoystick in 'Classes\UJoystick.pas', - ULCD in 'Classes\ULCD.pas', - ULight in 'Classes\ULight.pas', - UDataBase in 'Classes\UDataBase.pas', - UCovers in 'Classes\UCovers.pas', - UCatCovers in 'Classes\UCatCovers.pas', - UFiles in 'Classes\UFiles.pas', - UGraphicClasses in 'Classes\UGraphicClasses.pas', - UDLLManager in 'Classes\UDLLManager.pas', - UPlaylist in 'Classes\UPlaylist.pas', - UCommandLine in 'Classes\UCommandLine.pas', - UTextClasses in 'Classes\UTextClasses.pas', - USingScores in 'Classes\USingScores.pas', - USingNotes in 'Classes\USingNotes.pas', - - UModules in 'Classes\UModules.pas', //List of Modules to Load - UHooks in 'Classes\UHooks.pas', //Hook Managing - UServices in 'Classes\UServices.pas', //Service Managing - UCore in 'Classes\UCore.pas', //Core, Maybe remove this - UCoreModule in 'Classes\UCoreModule.pas', //^ - UPluginInterface in 'Classes\UPluginInterface.pas', //Interface offered by Core to Plugins - uPluginLoader in 'Classes\uPluginLoader.pas', //New Plugin Loader Module - - UParty in 'Classes\UParty.pas', // to - do : rewrite Party Manager as Module, reomplent ability to offer party Mody by Plugin - UPlatform in 'Classes\UPlatform.pas', -{$IFDEF WIN32} - UPlatformWindows in 'Classes\UPlatformWindows.pas', -{$ENDIF} -{$IFDEF LINUX} - UPlatformLinux in 'Classes\UPlatformLinux.pas', -{$ENDIF} - -{$IFDEF FPC} - ulazjpeg in 'Classes\Ulazjpeg.pas', -{$ENDIF} - - - //------------------------------ - //Includes - Media support classes.... - // Make sure UMedia always first, then UMedia_dummy - //------------------------------ - - // TODO : these all need to be renamed like UMedia_******** for consistency - UMusic in 'Classes\UMusic.pas', - UMedia_dummy in 'Classes\UMedia_dummy.pas', // Must be first UMedia Unit, all others will override available interfaces -{$IFDEF UseProjectM} - UVisualizer in 'Classes\UVisualizer.pas', // MUST be before Video... so video can override... -{$ENDIF} - UVideo in 'Classes\UVideo.pas', -{$ifdef UseBass} - UAudio_bass in 'Classes\UAudio_bass.pas', -{$endif} -{$ifdef UsePortaudio} - UAudio_portaudio in 'Classes\UAudio_portaudio.pas', -{$endif} -{$ifdef UseFFMpegAudio} - UAudio_FFMpeg in 'Classes\UAudio_FFMpeg.pas', -{$endif} - - - //------------------------------ - //Includes - Screens - //------------------------------ - UScreenLoading in 'Screens\UScreenLoading.pas', - UScreenWelcome in 'Screens\UScreenWelcome.pas', - UScreenMain in 'Screens\UScreenMain.pas', - UScreenName in 'Screens\UScreenName.pas', - UScreenLevel in 'Screens\UScreenLevel.pas', - UScreenSong in 'Screens\UScreenSong.pas', - UScreenSing in 'Screens\UScreenSing.pas', - UScreenScore in 'Screens\UScreenScore.pas', - UScreenOptions in 'Screens\UScreenOptions.pas', - UScreenOptionsGame in 'Screens\UScreenOptionsGame.pas', - UScreenOptionsGraphics in 'Screens\UScreenOptionsGraphics.pas', - UScreenOptionsSound in 'Screens\UScreenOptionsSound.pas', - UScreenOptionsLyrics in 'Screens\UScreenOptionsLyrics.pas', - UScreenOptionsThemes in 'Screens\UScreenOptionsThemes.pas', - UScreenOptionsRecord in 'Screens\UScreenOptionsRecord.pas', - UScreenOptionsAdvanced in 'Screens\UScreenOptionsAdvanced.pas', - UScreenEditSub in 'Screens\UScreenEditSub.pas', - UScreenEdit in 'Screens\UScreenEdit.pas', - UScreenEditConvert in 'Screens\UScreenEditConvert.pas', - UScreenEditHeader in 'Screens\UScreenEditHeader.pas', - UScreenOpen in 'Screens\UScreenOpen.pas', - UScreenTop5 in 'Screens\UScreenTop5.pas', - UScreenSongMenu in 'Screens\UScreenSongMenu.pas', - UScreenSongJumpto in 'Screens\UScreenSongJumpto.pas', - UScreenStatMain in 'Screens\UScreenStatMain.pas', - UScreenStatDetail in 'Screens\UScreenStatDetail.pas', - UScreenCredits in 'Screens\UScreenCredits.pas', - UScreenPopup in 'Screens\UScreenPopup.pas', - - //Includes - Screens PartyMode - UScreenSingModi in 'Screens\UScreenSingModi.pas', - UScreenPartyNewRound in 'Screens\UScreenPartyNewRound.pas', - UScreenPartyScore in 'Screens\UScreenPartyScore.pas', - UScreenPartyPlayer in 'Screens\UScreenPartyPlayer.pas', - UScreenPartyOptions in 'Screens\UScreenPartyOptions.pas', - UScreenPartyWin in 'Screens\UScreenPartyWin.pas', - - - //------------------------------ - //Includes - Modi SDK - //------------------------------ - ModiSDK in '..\..\Modis\SDK\ModiSDK.pas', //Old SDK, will be deleted soon - UPluginDefs in '..\..\Modis\SDK\UPluginDefs.pas', //New SDK, not only Modis - UPartyDefs in '..\..\Modis\SDK\UPartyDefs.pas', //Headers to register Party Modes - - {$IFDEF win32} - Windows, - {$ENDIF} - SysUtils; - -const - Version = 'UltraStar Deluxe V 1.10 Alpha Build'; - -{$IFNDEF FPC} -begin - Main; -end. -{$ENDIF} +{$IFNDEF FPC} // This is here, so linux & MacOS X Versions can simply include the uses + // from the dpr. Saves dupicating the uses clause. +program UltraStar; + + {$R 'UltraStar.res' 'UltraStar.rc'} + {$I switches.inc} + +uses +{$ENDIF} + + //------------------------------ + //Includes - 3rd Party Libraries + //------------------------------ + moduleloader in 'lib\JEDI-SDLv1.0\SDL\Pas\moduleloader.pas', + opengl12 in 'lib\JEDI-SDLv1.0\OpenGL\Pas\opengl12.pas', + sdl in 'lib\JEDI-SDLv1.0\SDL\Pas\sdl.pas', + sdl_image in 'lib\JEDI-SDLv1.0\SDL_Image\Pas\sdl_image.pas', + sdl_ttf in 'lib\JEDI-SDLv1.0\SDL_ttf\Pas\sdl_ttf.pas', + sdlutils in 'lib\JEDI-SDLv1.0\SDL\Pas\sdlutils.pas', + + {$ifdef UseBass} + bass in 'lib\bass\delphi\bass.pas', + {$endif} + {$ifdef UsePortAudio} + portaudio in 'lib\portaudio\delphi\portaudio.pas', + {$endif} + {$ifdef UsePortmixer} + portmixer in 'lib\portmixer\delphi\portmixer.pas', + {$endif} + + {$ifdef delphi} + midiout in 'lib\midi\midiout.pas', + midiin in 'lib\midi\midiin.pas', + CIRCBUF in 'lib\midi\CIRCBUF.PAS', + MidiType in 'lib\midi\MidiType.PAS', + MidiDefs in 'lib\midi\MidiDefs.PAS', + MidiCons in 'lib\midi\MidiCons.PAS', + MidiFile in 'lib\midi\MidiFile.PAS', + Delphmcb in 'lib\midi\Delphmcb.PAS', + + DirWatch in 'lib\other\DirWatch.pas', + {$endif} + + avcodec in 'lib\ffmpeg\avcodec.pas', + avformat in 'lib\ffmpeg\avformat.pas', + avutil in 'lib\ffmpeg\avutil.pas', + rational in 'lib\ffmpeg\rational.pas', + opt in 'lib\ffmpeg\opt.pas', + avio in 'lib\ffmpeg\avio.pas', +// swscale in 'lib\ffmpeg\swscale.pas', + + {$ifdef UseProjectM_0_9} + projectM in 'lib\projectM\0.9\projectM.pas', + {$endif} + {$ifdef UseProjectM_1_0} + projectM in 'lib\projectM\1.0\projectM.pas', + {$endif} + + SQLiteTable3 in 'lib\SQLite\SQLiteTable3.pas', + SQLite3 in 'lib\SQLite\SQLite3.pas', + + + //------------------------------ + //Includes - Menu System + //------------------------------ + UDisplay in 'Menu\UDisplay.pas', + UMenu in 'Menu\UMenu.pas', + UMenuStatic in 'Menu\UMenuStatic.pas', + UMenuText in 'Menu\UMenuText.pas', + UMenuButton in 'Menu\UMenuButton.pas', + UMenuInteract in 'Menu\UMenuInteract.pas', + UMenuSelect in 'Menu\UMenuSelect.pas', + UMenuSelectSlide in 'Menu\UMenuSelectSlide.pas', + UDrawTexture in 'Menu\UDrawTexture.pas', + UMenuButtonCollection in 'Menu\UMenuButtonCollection.pas', + + //------------------------------ + //Includes - Classes + //------------------------------ + UCommon in 'Classes\UCommon.pas', + UGraphic in 'Classes\UGraphic.pas', + UTexture in 'Classes\UTexture.pas', + ULanguage in 'Classes\ULanguage.pas', + UMain in 'Classes\UMain.pas', + UDraw in 'Classes\UDraw.pas', + URecord in 'Classes\URecord.pas', + UTime in 'Classes\UTime.pas', + TextGL in 'Classes\TextGL.pas', + USongs in 'Classes\USongs.pas', + UIni in 'Classes\UIni.pas', + ULyrics in 'Classes\ULyrics.pas', + ULyrics_bak in 'Classes\ULyrics_bak.pas', + USkins in 'Classes\USkins.pas', + UThemes in 'Classes\UThemes.pas', + ULog in 'Classes\ULog.pas', + UJoystick in 'Classes\UJoystick.pas', + ULCD in 'Classes\ULCD.pas', + ULight in 'Classes\ULight.pas', + UDataBase in 'Classes\UDataBase.pas', + UCovers in 'Classes\UCovers.pas', + UCatCovers in 'Classes\UCatCovers.pas', + UFiles in 'Classes\UFiles.pas', + UGraphicClasses in 'Classes\UGraphicClasses.pas', + UDLLManager in 'Classes\UDLLManager.pas', + UPlaylist in 'Classes\UPlaylist.pas', + UCommandLine in 'Classes\UCommandLine.pas', + UTextClasses in 'Classes\UTextClasses.pas', + USingScores in 'Classes\USingScores.pas', + USingNotes in 'Classes\USingNotes.pas', + + UModules in 'Classes\UModules.pas', //List of Modules to Load + UHooks in 'Classes\UHooks.pas', //Hook Managing + UServices in 'Classes\UServices.pas', //Service Managing + UCore in 'Classes\UCore.pas', //Core, Maybe remove this + UCoreModule in 'Classes\UCoreModule.pas', //^ + UPluginInterface in 'Classes\UPluginInterface.pas', //Interface offered by Core to Plugins + uPluginLoader in 'Classes\uPluginLoader.pas', //New Plugin Loader Module + + UParty in 'Classes\UParty.pas', // to - do : rewrite Party Manager as Module, reomplent ability to offer party Mody by Plugin + UPlatform in 'Classes\UPlatform.pas', +{$IFDEF WIN32} + UPlatformWindows in 'Classes\UPlatformWindows.pas', +{$ENDIF} +{$IFDEF LINUX} + UPlatformLinux in 'Classes\UPlatformLinux.pas', +{$ENDIF} + +{$IFDEF FPC} + ulazjpeg in 'Classes\Ulazjpeg.pas', +{$ENDIF} + + + //------------------------------ + //Includes - Media support classes.... + // Make sure UMedia always first, then UMedia_dummy + //------------------------------ + + // TODO : these all need to be renamed like UMedia_******** for consistency + UMusic in 'Classes\UMusic.pas', + UMedia_dummy in 'Classes\UMedia_dummy.pas', // Must be first UMedia Unit, all others will override available interfaces +{$IFDEF UseProjectM} + UVisualizer in 'Classes\UVisualizer.pas', // MUST be before Video... so video can override... +{$ENDIF} + UVideo in 'Classes\UVideo.pas', +{$ifdef UseBass} + UAudio_bass in 'Classes\UAudio_bass.pas', +{$endif} +{$ifdef UsePortaudio} + UAudio_portaudio in 'Classes\UAudio_portaudio.pas', +{$endif} +{$ifdef UseFFMpegAudio} + UAudio_FFMpeg in 'Classes\UAudio_FFMpeg.pas', +{$endif} + + + //------------------------------ + //Includes - Screens + //------------------------------ + UScreenLoading in 'Screens\UScreenLoading.pas', + UScreenWelcome in 'Screens\UScreenWelcome.pas', + UScreenMain in 'Screens\UScreenMain.pas', + UScreenName in 'Screens\UScreenName.pas', + UScreenLevel in 'Screens\UScreenLevel.pas', + UScreenSong in 'Screens\UScreenSong.pas', + UScreenSing in 'Screens\UScreenSing.pas', + UScreenScore in 'Screens\UScreenScore.pas', + UScreenOptions in 'Screens\UScreenOptions.pas', + UScreenOptionsGame in 'Screens\UScreenOptionsGame.pas', + UScreenOptionsGraphics in 'Screens\UScreenOptionsGraphics.pas', + UScreenOptionsSound in 'Screens\UScreenOptionsSound.pas', + UScreenOptionsLyrics in 'Screens\UScreenOptionsLyrics.pas', + UScreenOptionsThemes in 'Screens\UScreenOptionsThemes.pas', + UScreenOptionsRecord in 'Screens\UScreenOptionsRecord.pas', + UScreenOptionsAdvanced in 'Screens\UScreenOptionsAdvanced.pas', + UScreenEditSub in 'Screens\UScreenEditSub.pas', + UScreenEdit in 'Screens\UScreenEdit.pas', + UScreenEditConvert in 'Screens\UScreenEditConvert.pas', + UScreenEditHeader in 'Screens\UScreenEditHeader.pas', + UScreenOpen in 'Screens\UScreenOpen.pas', + UScreenTop5 in 'Screens\UScreenTop5.pas', + UScreenSongMenu in 'Screens\UScreenSongMenu.pas', + UScreenSongJumpto in 'Screens\UScreenSongJumpto.pas', + UScreenStatMain in 'Screens\UScreenStatMain.pas', + UScreenStatDetail in 'Screens\UScreenStatDetail.pas', + UScreenCredits in 'Screens\UScreenCredits.pas', + UScreenPopup in 'Screens\UScreenPopup.pas', + + //Includes - Screens PartyMode + UScreenSingModi in 'Screens\UScreenSingModi.pas', + UScreenPartyNewRound in 'Screens\UScreenPartyNewRound.pas', + UScreenPartyScore in 'Screens\UScreenPartyScore.pas', + UScreenPartyPlayer in 'Screens\UScreenPartyPlayer.pas', + UScreenPartyOptions in 'Screens\UScreenPartyOptions.pas', + UScreenPartyWin in 'Screens\UScreenPartyWin.pas', + + + //------------------------------ + //Includes - Modi SDK + //------------------------------ + ModiSDK in '..\..\Modis\SDK\ModiSDK.pas', //Old SDK, will be deleted soon + UPluginDefs in '..\..\Modis\SDK\UPluginDefs.pas', //New SDK, not only Modis + UPartyDefs in '..\..\Modis\SDK\UPartyDefs.pas', //Headers to register Party Modes + + {$IFDEF win32} + Windows, + {$ENDIF} + SysUtils; + +const + Version = 'UltraStar Deluxe V 1.10 Alpha Build'; + +{$IFNDEF FPC} +begin + Main; +end. +{$ENDIF} -- cgit v1.2.3 From 7d61a98f807803a337fd12342c29eb0f5f69fc76 Mon Sep 17 00:00:00 2001 From: jaybinks Date: Thu, 20 Dec 2007 03:33:14 +0000 Subject: made USDX function when file paths differ from previous expectations.. ( most of the software was still using hard coded paths ) also added ability to have multiple song directories. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@735 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index b442b3bc..b15c5bbf 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -149,7 +149,7 @@ uses UAudio_portaudio in 'Classes\UAudio_portaudio.pas', {$endif} {$ifdef UseFFMpegAudio} - UAudio_FFMpeg in 'Classes\UAudio_FFMpeg.pas', + UAudio_FFMpeg in 'Classes\UAudio_FFMpeg.pas', {$endif} -- cgit v1.2.3 From ff1dc556936cef441e105a19aa9d1d3b9e0cc833 Mon Sep 17 00:00:00 2001 From: tobigun Date: Fri, 11 Jan 2008 13:52:44 +0000 Subject: changed from ffmpeg-free (audio) to ffmpeg-enabled (if turned on in switches.inc) version. BASS is used by default. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@786 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index b15c5bbf..236d0b1e 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -21,7 +21,7 @@ uses {$ifdef UseBass} bass in 'lib\bass\delphi\bass.pas', {$endif} - {$ifdef UsePortAudio} + {$ifdef UsePortaudio} portaudio in 'lib\portaudio\delphi\portaudio.pas', {$endif} {$ifdef UsePortmixer} @@ -47,6 +47,7 @@ uses rational in 'lib\ffmpeg\rational.pas', opt in 'lib\ffmpeg\opt.pas', avio in 'lib\ffmpeg\avio.pas', + mathematics in 'lib\ffmpeg\mathematics.pas', // swscale in 'lib\ffmpeg\swscale.pas', {$ifdef UseProjectM_0_9} @@ -142,14 +143,20 @@ uses UVisualizer in 'Classes\UVisualizer.pas', // MUST be before Video... so video can override... {$ENDIF} UVideo in 'Classes\UVideo.pas', -{$ifdef UseBass} - UAudio_bass in 'Classes\UAudio_bass.pas', +{$ifdef UseFFMpegDecoder} + UAudioDecoder_FFMpeg in 'Classes\UAudioDecoder_FFMpeg.pas', // MUST be before Playback-classes {$endif} -{$ifdef UsePortaudio} - UAudio_portaudio in 'Classes\UAudio_portaudio.pas', +{$ifdef UseBASSInput} + UAudioInput_Bass in 'Classes\UAudioInput_Bass.pas', {$endif} -{$ifdef UseFFMpegAudio} - UAudio_FFMpeg in 'Classes\UAudio_FFMpeg.pas', +{$ifdef UseBASSPlayback} + UAudioPlayback_Bass in 'Classes\UAudioPlayback_Bass.pas', +{$endif} +{$ifdef UsePortaudioInput} + UAudioInput_Portaudio in 'Classes\UAudioInput_Portaudio.pas', +{$endif} +{$ifdef UsePortaudioPlayback} + UAudioPlayback_Portaudio in 'Classes\UAudioPlayback_Portaudio.pas', {$endif} -- cgit v1.2.3 From e74bd57c12f470257111c1c0530fb38f0fd34414 Mon Sep 17 00:00:00 2001 From: jaybinks Date: Sat, 12 Jan 2008 12:31:43 +0000 Subject: bunch of smaller changes... some changes to song loading... Record global changed to singleton object started implementing mic volume display in Settings-Record hope this dosnt break anything.. :P git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@789 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 1 + 1 file changed, 1 insertion(+) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index 236d0b1e..ca639d1e 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -87,6 +87,7 @@ uses URecord in 'Classes\URecord.pas', UTime in 'Classes\UTime.pas', TextGL in 'Classes\TextGL.pas', + USong in 'Classes\USong.pas', USongs in 'Classes\USongs.pas', UIni in 'Classes\UIni.pas', ULyrics in 'Classes\ULyrics.pas', -- cgit v1.2.3 From 1cec357365c6260da0667966460387aaffa76436 Mon Sep 17 00:00:00 2001 From: jaybinks Date: Tue, 5 Feb 2008 11:27:22 +0000 Subject: renamed Jedi-SDL folder. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@810 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index ca639d1e..e2242d1b 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -11,12 +11,12 @@ uses //------------------------------ //Includes - 3rd Party Libraries //------------------------------ - moduleloader in 'lib\JEDI-SDLv1.0\SDL\Pas\moduleloader.pas', - opengl12 in 'lib\JEDI-SDLv1.0\OpenGL\Pas\opengl12.pas', - sdl in 'lib\JEDI-SDLv1.0\SDL\Pas\sdl.pas', - sdl_image in 'lib\JEDI-SDLv1.0\SDL_Image\Pas\sdl_image.pas', - sdl_ttf in 'lib\JEDI-SDLv1.0\SDL_ttf\Pas\sdl_ttf.pas', - sdlutils in 'lib\JEDI-SDLv1.0\SDL\Pas\sdlutils.pas', + moduleloader in 'lib\JEDI-SDL\SDL\Pas\moduleloader.pas', + opengl12 in 'lib\JEDI-SDL\OpenGL\Pas\opengl12.pas', + sdl in 'lib\JEDI-SDL\SDL\Pas\sdl.pas', + sdl_image in 'lib\JEDI-SDL\SDL_Image\Pas\sdl_image.pas', + sdl_ttf in 'lib\JEDI-SDL\SDL_ttf\Pas\sdl_ttf.pas', + sdlutils in 'lib\JEDI-SDL\SDL\Pas\sdlutils.pas', {$ifdef UseBass} bass in 'lib\bass\delphi\bass.pas', -- cgit v1.2.3 From eafa73ec3181ed45a8a6fdea8ef64fc9a1e867b3 Mon Sep 17 00:00:00 2001 From: tobigun Date: Tue, 5 Feb 2008 13:37:02 +0000 Subject: Introduction of config-file mechanism. For now just the windows version. Linux and MacOSX later. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@813 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index e2242d1b..18a825eb 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -78,6 +78,8 @@ uses //------------------------------ //Includes - Classes //------------------------------ + UConfig in 'Classes\UConfig.pas', + UCommon in 'Classes\UCommon.pas', UGraphic in 'Classes\UGraphic.pas', UTexture in 'Classes\UTexture.pas', -- cgit v1.2.3 From bf548af7791d9a97f69585e644d3d823dab02898 Mon Sep 17 00:00:00 2001 From: tobigun Date: Tue, 5 Feb 2008 15:26:25 +0000 Subject: New switches.inc layout git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@819 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 66 +++++++++++++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 29 deletions(-) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index 18a825eb..788b1018 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -18,17 +18,19 @@ uses sdl_ttf in 'lib\JEDI-SDL\SDL_ttf\Pas\sdl_ttf.pas', sdlutils in 'lib\JEDI-SDL\SDL\Pas\sdlutils.pas', - {$ifdef UseBass} - bass in 'lib\bass\delphi\bass.pas', - {$endif} - {$ifdef UsePortaudio} - portaudio in 'lib\portaudio\delphi\portaudio.pas', - {$endif} - {$ifdef UsePortmixer} - portmixer in 'lib\portmixer\delphi\portmixer.pas', - {$endif} - - {$ifdef delphi} + {$IFDEF UseBass} + bass in 'lib\bass\delphi\bass.pas', + //UAudioCore_Bass in 'Classes\UAudioCore_Bass.pas', + {$ENDIF} + {$IFDEF UsePortaudio} + portaudio in 'lib\portaudio\delphi\portaudio.pas', + {$ENDIF} + {$IFDEF UsePortmixer} + portmixer in 'lib\portmixer\delphi\portmixer.pas', + {$ENDIF} + + //{$IFDEF MSWINDOWS} + {$IFDEF Delphi} midiout in 'lib\midi\midiout.pas', midiin in 'lib\midi\midiin.pas', CIRCBUF in 'lib\midi\CIRCBUF.PAS', @@ -39,8 +41,9 @@ uses Delphmcb in 'lib\midi\Delphmcb.PAS', DirWatch in 'lib\other\DirWatch.pas', - {$endif} + {$ENDIF} + {$IFDEF UseFFMpeg} avcodec in 'lib\ffmpeg\avcodec.pas', avformat in 'lib\ffmpeg\avformat.pas', avutil in 'lib\ffmpeg\avutil.pas', @@ -48,14 +51,17 @@ uses opt in 'lib\ffmpeg\opt.pas', avio in 'lib\ffmpeg\avio.pas', mathematics in 'lib\ffmpeg\mathematics.pas', -// swscale in 'lib\ffmpeg\swscale.pas', + {$ENDIF} + {$IFDEF UseSWScale} + swscale in 'lib\ffmpeg\swscale.pas', + {$ENDIF} - {$ifdef UseProjectM_0_9} + {$IFDEF UseProjectM_0_9} projectM in 'lib\projectM\0.9\projectM.pas', - {$endif} - {$ifdef UseProjectM_1_0} + {$ENDIF} + {$IFDEF UseProjectM_1_0} projectM in 'lib\projectM\1.0\projectM.pas', - {$endif} + {$ENDIF} SQLiteTable3 in 'lib\SQLite\SQLiteTable3.pas', SQLite3 in 'lib\SQLite\SQLite3.pas', @@ -145,22 +151,24 @@ uses {$IFDEF UseProjectM} UVisualizer in 'Classes\UVisualizer.pas', // MUST be before Video... so video can override... {$ENDIF} +{$IFDEF UseFFMpegVideo} UVideo in 'Classes\UVideo.pas', -{$ifdef UseFFMpegDecoder} +{$ENDIF} +{$IFDEF UseFFMpegDecoder} UAudioDecoder_FFMpeg in 'Classes\UAudioDecoder_FFMpeg.pas', // MUST be before Playback-classes -{$endif} -{$ifdef UseBASSInput} +{$ENDIF} +{$IFDEF UseBASSInput} UAudioInput_Bass in 'Classes\UAudioInput_Bass.pas', -{$endif} -{$ifdef UseBASSPlayback} +{$ENDIF} +{$IFDEF UseBASSPlayback} UAudioPlayback_Bass in 'Classes\UAudioPlayback_Bass.pas', -{$endif} -{$ifdef UsePortaudioInput} +{$ENDIF} +{$IFDEF UsePortaudioInput} UAudioInput_Portaudio in 'Classes\UAudioInput_Portaudio.pas', -{$endif} -{$ifdef UsePortaudioPlayback} +{$ENDIF} +{$IFDEF UsePortaudioPlayback} UAudioPlayback_Portaudio in 'Classes\UAudioPlayback_Portaudio.pas', -{$endif} +{$ENDIF} //------------------------------ @@ -204,7 +212,7 @@ uses UScreenPartyWin in 'Screens\UScreenPartyWin.pas', - //------------------------------ + //------------------------------ //Includes - Modi SDK //------------------------------ ModiSDK in '..\..\Modis\SDK\ModiSDK.pas', //Old SDK, will be deleted soon @@ -213,7 +221,7 @@ uses {$IFDEF win32} Windows, - {$ENDIF} + {$ENDIF} SysUtils; const -- cgit v1.2.3 From 31056e848f9aa03e4adf40e9480b122bc510f2cf Mon Sep 17 00:00:00 2001 From: tobigun Date: Tue, 5 Feb 2008 15:56:07 +0000 Subject: Sorry, must be UseProjectM_1_0_PLUS now git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@820 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index 788b1018..09acffb3 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -59,7 +59,7 @@ uses {$IFDEF UseProjectM_0_9} projectM in 'lib\projectM\0.9\projectM.pas', {$ENDIF} - {$IFDEF UseProjectM_1_0} + {$IFDEF UseProjectM_1_0_PLUS} projectM in 'lib\projectM\1.0\projectM.pas', {$ENDIF} -- cgit v1.2.3 From 2eb92f1b07828c0631d297bd26cfb249ccbd20ef Mon Sep 17 00:00:00 2001 From: tobigun Date: Tue, 5 Feb 2008 16:26:40 +0000 Subject: - DirWatch-support with FPC (windows only) - added UAudioCore_Bass.pas git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@823 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index 09acffb3..5c26180e 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -20,7 +20,7 @@ uses {$IFDEF UseBass} bass in 'lib\bass\delphi\bass.pas', - //UAudioCore_Bass in 'Classes\UAudioCore_Bass.pas', + UAudioCore_Bass in 'Classes\UAudioCore_Bass.pas', {$ENDIF} {$IFDEF UsePortaudio} portaudio in 'lib\portaudio\delphi\portaudio.pas', @@ -39,7 +39,9 @@ uses MidiCons in 'lib\midi\MidiCons.PAS', MidiFile in 'lib\midi\MidiFile.PAS', Delphmcb in 'lib\midi\Delphmcb.PAS', + {$ENDIF} + {$IFDEF MSWINDOWS} DirWatch in 'lib\other\DirWatch.pas', {$ENDIF} -- cgit v1.2.3 From d4d3d8873fea024cd9e1f17b04416bebe627d1f0 Mon Sep 17 00:00:00 2001 From: tobigun Date: Thu, 7 Feb 2008 19:52:50 +0000 Subject: SWScale will only be used if FFMpeg is available (this should be the standard case) git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@839 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/UltraStar.dpr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Game/Code/UltraStar.dpr') diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index 5c26180e..d624e809 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -53,10 +53,10 @@ uses opt in 'lib\ffmpeg\opt.pas', avio in 'lib\ffmpeg\avio.pas', mathematics in 'lib\ffmpeg\mathematics.pas', - {$ENDIF} {$IFDEF UseSWScale} swscale in 'lib\ffmpeg\swscale.pas', {$ENDIF} + {$ENDIF} {$IFDEF UseProjectM_0_9} projectM in 'lib\projectM\0.9\projectM.pas', -- cgit v1.2.3