diff options
| -rw-r--r-- | Game/Code/Classes/UGraphic.pas | 4 | ||||
| -rw-r--r-- | Game/Code/Classes/ULog.pas | 4 | ||||
| -rw-r--r-- | Game/Code/Screens/UScreenEditSub.pas | 8 | ||||
| -rw-r--r-- | Game/Code/Screens/UScreenMain.pas | 9 | ||||
| -rw-r--r-- | Game/Code/UltraStar.dpr | 2 |
5 files changed, 25 insertions, 2 deletions
diff --git a/Game/Code/Classes/UGraphic.pas b/Game/Code/Classes/UGraphic.pas index bcb2aa65..0dae93a6 100644 --- a/Game/Code/Classes/UGraphic.pas +++ b/Game/Code/Classes/UGraphic.pas @@ -316,6 +316,10 @@ begin Log.BenchmarkStart(3);
LoadScreens;
+
+ if Log.NumErrors>0 then
+ ScreenMain.ShowNumErrors := true;
+
Display.ActualScreen^.FadeTo(@ScreenMain);
Log.BenchmarkEnd(2);
diff --git a/Game/Code/Classes/ULog.pas b/Game/Code/Classes/ULog.pas index ce6d5f07..ed7855bd 100644 --- a/Game/Code/Classes/ULog.pas +++ b/Game/Code/Classes/ULog.pas @@ -14,6 +14,8 @@ type FileError: TextFile;
FileErrorO: boolean; // opened
+ NumErrors: integer;
+
Title: String; //Application Title
//Should Log Files be written
@@ -145,6 +147,7 @@ procedure TLog.LogError(Text: string); begin
if Enabled AND (not FileErrorO) then begin
FileErrorO := true;
+ NumErrors := 0;
AssignFile(FileError, LogPath + 'Error.log');
{$I-}
Rewrite(FileError);
@@ -166,6 +169,7 @@ begin try
WriteLn(FileError, Text);
Flush(FileError);
+ Inc(NumErrors);
except
FileErrorO := false;
end;
diff --git a/Game/Code/Screens/UScreenEditSub.pas b/Game/Code/Screens/UScreenEditSub.pas index 0f11faf0..d5c7d9aa 100644 --- a/Game/Code/Screens/UScreenEditSub.pas +++ b/Game/Code/Screens/UScreenEditSub.pas @@ -543,8 +543,13 @@ begin CopySentence(CopySrc, Czesci[0].Akt);
end;
- if SDL_ModState = 0 then begin
+ if SDL_ModState = 0 then
StartVideo;
+
+ if SDL_ModState = KMOD_LSHIFT then
+ begin
+ StartVideo;
+ Click := true;
end;
end;
@@ -2182,6 +2187,7 @@ begin Lyric.Draw;
DrawInfoBar(20, 460, 760, 20);
+ glLineWidth(1); //bad fix...
if UVideo.VideoOpened and PlayVideo then
begin
diff --git a/Game/Code/Screens/UScreenMain.pas b/Game/Code/Screens/UScreenMain.pas index b2b4c497..4b6c58a4 100644 --- a/Game/Code/Screens/UScreenMain.pas +++ b/Game/Code/Screens/UScreenMain.pas @@ -14,6 +14,8 @@ type TextDescription: integer;
TextDescriptionLong: integer;
+ ShowNumErrors: boolean;
+
constructor Create; override;
function ParseInput(PressedKey: Cardinal; ScanCode: byte; PressedDown: Boolean): Boolean; override;
procedure onShow; override;
@@ -262,6 +264,7 @@ begin AddButton(Theme.Main.ButtonExit);
Interaction := 0;
+ ShowNumErrors := false;
end;
procedure TScreenMain.onShow;
@@ -273,6 +276,12 @@ begin PlaylistMan.Mode := 0;
if not Help.SetHelpID(ID) then
Log.LogError('No Entry for Help-ID ' + ID + ' (ScreenMain)');
+
+ if ShowNumErrors then
+ begin
+ ShowNumErrors := false;
+ ScreenPopupError.ShowPopup(IntToStr(Log.NumErrors) + ' errors on loading, see Error.log for details');
+ end;
end;
procedure TScreenMain.InteractNext;
diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index 305d6f3c..437578d8 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -124,7 +124,7 @@ uses acinerella in 'lib\acinerella\acinerella.pas';
const
- Version = 'UltraStar Deluxe v1.0.1a Challenge-MOD r7 alpha 6 2010-02-27';
+ Version = 'UltraStar Deluxe v1.0.1a Challenge-MOD r7 beta 1 2010-02-28';
var
WndTitle: string;
|