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

This commit is contained in:
Jáchym Toušek
2018-01-27 18:09:46 +01:00
14 changed files with 184 additions and 90 deletions

View File

@@ -375,7 +375,25 @@ void main()
//setwindow 31,16,22,16,26,26,0,2,20,1,1,#ffffff,0,0,639,479
DisableWindow();
DrawScene("white", 400 );
DrawScene("background/jt1", 3000 );
// DrawScene( "bg_216", 3000 );
//draw and move big background
SetValidityOfInterface(FALSE);
SetValidityOfSaving(FALSE);
DrawBustshot(4, "hina1_1", 0, -230, -480, FALSE, 0, 0, 0, 0, 0, 0, 0, 1, 200, FALSE );
DrawBustshot(3, "hina1_2", 0, -230, -480, FALSE, 0, 0, 0, 0, 0, 0, 0, 2, 200, FALSE );
DrawBustshot(2, "hina1_3", 0, -230, -480, FALSE, 0, 0, 0, 0, 0, 0, 0, 3, 200, FALSE );
DrawBustshot(1, "hina1_4", 0, -230, -480, FALSE, 0, 0, 0, 0, 0, 0, 0, 4, 200, TRUE );
MoveBustshot( 1, NULL, 0, 290, -480, 1, 10000, FALSE );
MoveBustshot( 2, NULL, 0, 280, -480, 2, 10000, FALSE );
MoveBustshot( 3, NULL, 0, 230, -480, 3, 10000, FALSE );
MoveBustshot( 4, NULL, 0, 200, -480, 4, 10000, TRUE );
//set end position for skip
MoveBustshot( 1, NULL, 0, 290, -480, 1, 0, FALSE );
MoveBustshot( 2, NULL, 0, 280, -480, 2, 0, FALSE );
MoveBustshot( 3, NULL, 0, 230, -480, 3, 0, FALSE );
MoveBustshot( 4, NULL, 0, 200, -480, 4, 0, TRUE );
//setwindow 31,16,22,16,26,26,0,2,20,1,1,#999999,0,0,639,479
//!sd
@@ -399,6 +417,22 @@ void main()
DrawScene("black", 3000 );
SetValidityOfInput( TRUE );
//reset big background layer
DrawBustshot(1, "alphaimage", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 0, TRUE );
DrawBustshot(2, "alphaimage", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 0, TRUE );
DrawBustshot(3, "alphaimage", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 0, TRUE );
DrawBustshot(4, "alphaimage", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 0, TRUE );
DrawBustshot(5, "alphaimage", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 0, TRUE );
DrawBustshot(6, "alphaimage", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 0, TRUE );
DrawBustshot(7, "alphaimage", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 0, TRUE );
DrawBustshot( 1, "", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 0, TRUE );
DrawBustshot( 2, "", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 0, TRUE );
DrawBustshot( 3, "", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 0, TRUE );
DrawBustshot( 4, "", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 0, TRUE );
DrawBustshot( 5, "", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 0, TRUE );
DrawBustshot( 6, "", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 0, TRUE );
DrawBustshot( 7, "", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 0, TRUE );
SetValidityOfInterface(TRUE);
SetValidityOfSaving(TRUE);
}