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

@@ -491,7 +491,7 @@ void main()
Wait( 200 );
PlaySE( 4, "wa_005", 128, 64 );
ShakeScreen( 0, 50, 20, 2, 0, );
OutputLineAll(NULL, "", Line_WaitForInput);
OutputLineAll(NULL, "", Line_Normal);
ClearMessage();
@@ -549,7 +549,7 @@ void main()
Wait( 200 );
PlaySE( 4, "wa_002", 128, 64 );
Wait( 200 );
OutputLineAll(NULL, "", Line_WaitForInput);
OutputLineAll(NULL, "", Line_Normal);
ClearMessage();