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

@@ -2228,7 +2228,7 @@ void main()
PlaySE( 4, "wa_002", 128, 64 );
ShakeScreen( 1, 50, 20, 5, 0, );
OutputLineAll(NULL, "", Line_WaitForInput);
OutputLineAll(NULL, "", Line_Normal);
ClearMessage();
@@ -2451,7 +2451,7 @@ void main()
PlaySE( 4, "wa_007", 128, 64 );
ShakeScreen( 1, 50, 20, 3, 0, );
OutputLineAll(NULL, "", Line_WaitForInput);
OutputLineAll(NULL, "", Line_Normal);
ClearMessage();
DisableWindow();