Merge master

This commit is contained in:
Jáchym Toušek
2017-07-05 17:46:58 +02:00
16 changed files with 32 additions and 32 deletions

View File

@@ -472,7 +472,7 @@ void main()
//!sd
SetSpeedOfMessage( FALSE, 0, );
OutputLineAll(NULL, "", Line_WaitForInput);
OutputLineAll(NULL, "", Line_Normal);
ClearMessage();
@@ -662,7 +662,7 @@ void main()
NULL, "Kesplash!!!", Line_ContinueAfterTyping);
ShakeScreenSx( 1, 3, );
OutputLineAll(NULL, "", Line_WaitForInput);
OutputLineAll(NULL, "", Line_Normal);
ClearMessage();
DisableWindow();
@@ -3904,7 +3904,7 @@ void main()
SetValidityOfInput( FALSE );
Wait( 2000 );
SetValidityOfInput( TRUE );
OutputLineAll(NULL, "", Line_WaitForInput);
OutputLineAll(NULL, "", Line_Normal);
ClearMessage();
@@ -4542,7 +4542,7 @@ void main()
Wait( 3000 );
SetValidityOfInput( TRUE );
OutputLineAll(NULL, "", Line_WaitForInput);
OutputLineAll(NULL, "", Line_Normal);
ClearMessage();