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

@@ -2163,7 +2163,7 @@ void main()
SetValidityOfInput( FALSE );
Wait( 2000 );
SetValidityOfInput( TRUE );
OutputLineAll(NULL, "", Line_WaitForInput);
OutputLineAll(NULL, "", Line_Normal);
ClearMessage();
@@ -5102,7 +5102,7 @@ void main()
SetValidityOfInput( FALSE );
Wait( 4000 );
SetValidityOfInput( TRUE );
OutputLineAll(NULL, "", Line_WaitForInput);
OutputLineAll(NULL, "", Line_Normal);
ClearMessage();
PlaySE( 4, "wa_008", 128, 64 );