From c2a79c5ca774093e34cd96e584da25cdc2b4b047 Mon Sep 17 00:00:00 2001 From: whiteshark0 Date: Sun, 29 Jul 2007 12:08:01 +0000 Subject: Changed Version to 1.00 (ready 4 Release xD) Credits Screen now loads on demand ( S0me loading speed improvement) git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/1.0x@339 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/Classes/UGraphic.pas | 5 +++-- Game/Code/Screens/UScreenMain.pas | 31 +++++++++++++++++++++++++------ Game/Code/UltraStar.dpr | 2 +- 3 files changed, 29 insertions(+), 9 deletions(-) diff --git a/Game/Code/Classes/UGraphic.pas b/Game/Code/Classes/UGraphic.pas index cf1a0c5a..105dcfd7 100644 --- a/Game/Code/Classes/UGraphic.pas +++ b/Game/Code/Classes/UGraphic.pas @@ -475,8 +475,9 @@ begin Log.BenchmarkEnd(3); Log.LogBenchmark('====> Screen Stat Main', 3); Log.BenchmarkStart(3); ScreenStatDetail := TScreenStatDetail.Create; Log.BenchmarkEnd(3); Log.LogBenchmark('====> Screen Stat Detail', 3); Log.BenchmarkStart(3); - ScreenCredits := TScreenCredits.Create; - Log.BenchmarkEnd(3); Log.LogBenchmark('====> Screen Credits', 3); Log.BenchmarkStart(3); + //Now Created when needed + //ScreenCredits := TScreenCredits.Create; + //Log.BenchmarkEnd(3); Log.LogBenchmark('====> Screen Credits', 3); Log.BenchmarkStart(3); end; diff --git a/Game/Code/Screens/UScreenMain.pas b/Game/Code/Screens/UScreenMain.pas index 085f253d..af27b9b1 100644 --- a/Game/Code/Screens/UScreenMain.pas +++ b/Game/Code/Screens/UScreenMain.pas @@ -25,7 +25,7 @@ type implementation -uses Windows, UGraphic, UMain, UIni, UTexture, USongs, Textgl, opengl, ULanguage, UParty, UDLLManager, UScreenCredits, USkins; +uses Windows, UGraphic, UMain, UIni, UTexture, USongs, Textgl, opengl, ULanguage, UParty, UDLLManager, UScreenCredits, USkins, ULog; function TScreenMain.ParseInput(PressedKey: Cardinal; ScanCode: byte; PressedDown: Boolean): Boolean; @@ -62,11 +62,30 @@ begin begin if (SDL_ModState = KMOD_LALT) then begin - //Credits_Y := 600; - //Credits_Alpha := 0; - //Credits_Visible := True; - Music.PlayStart; - FadeTo(@ScreenCredits); + //If CreditsScreen is not Created -> Then Create + If (ScreenCredits = nil) then + begin + try + //Display White Loading Text + SetFontStyle(2); //Font: Outlined1 + SetFontSize(12); + SetFontItalic(False); + SetFontPos (400 - glTextWidth ('Loading Credits ...')/2, 250); //Position + glColor4f(1,1,1,1); + glPrint('Loading Credits ...'); + SwapBuffers; + + ScreenCredits := TScreenCredits.Create; + except + Log.LogError ('Couldn''t Create Credits Screen'); + end; + end; + + If (ScreenCredits <> nil) then + begin + Music.PlayStart; + FadeTo(@ScreenCredits); + end; end; end; SDLK_M: diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index a49d43c2..8ea7c0e0 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -106,7 +106,7 @@ uses SysUtils; const - Version = 'UltraStar Deluxe V 1.00 RC1'; + Version = 'UltraStar Deluxe V 1.00'; var WndTitle: string; -- cgit v1.2.3