Merge remote-tracking branch 'origin/master' into lip-sync

This commit is contained in:
Jáchym Toušek
2018-01-28 22:52:58 +01:00
5 changed files with 22 additions and 22 deletions

View File

@@ -4647,7 +4647,7 @@ void main()
//draw big CG
SetValidityOfInterface(FALSE);
SetValidityOfSaving(FALSE);
ModDrawCharacter(1, 0, "scene/004b", "0", 0, -230, -480, FALSE, 0, 0, 0, 0, 0, 0, 0, 1, 200, TRUE );
DrawBustshot(1, "scene/004b", 0, -230, -480, FALSE, 0, 0, 0, 0, 0, 0, 0, 1, 200, TRUE );
ShakeScreen( 1, 50, 20, 3, 5);
//nega 0
@@ -4674,7 +4674,7 @@ void main()
ModDrawCharacter(2, 2, "sprite/sunset/re1a_bikkuri_a1_", "2", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 300, TRUE );
DrawBustshot( 1, "", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 1, 0, TRUE );
SetValidityOfInterface(TRUE);
SetValidityOfSaving(FALSE);
SetValidityOfSaving(TRUE);
if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }