diff options
| -rw-r--r-- | Game/Code/Classes/UGraphic.pas | 2 | ||||
| -rw-r--r-- | Game/Code/UltraStar.dpr | 102 |
2 files changed, 75 insertions, 29 deletions
diff --git a/Game/Code/Classes/UGraphic.pas b/Game/Code/Classes/UGraphic.pas index 09bbc1c9..7c0ef57e 100644 --- a/Game/Code/Classes/UGraphic.pas +++ b/Game/Code/Classes/UGraphic.pas @@ -312,7 +312,7 @@ end; procedure Initialize3D (Title: string);
var
// Icon: TIcon;
- Res: TResourceStream;
+// Res: TResourceStream;
ISurface: PSDL_Surface;
Pixel: PByteArray;
I: Integer;
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.
+
|