merge with GuraGura 1.5

This commit is contained in:
Cnnctr
2015-06-05 01:31:25 +02:00
parent 1e25926dbb
commit fb14f913b4
9 changed files with 40 additions and 13 deletions

View File

@@ -329,7 +329,7 @@
//setwindow 31,16,22,16,26,26,0,2,20,1,1,#ffffff,0,0,639,479
DisableWindow();
DrawScene( "white", 400 );
DrawScene( "bg_048", 3000 );
DrawScene( "bg_216", 3000 );
//setwindow 31,16,22,16,26,26,0,2,20,1,1,#999999,0,0,639,479
//!sd
@@ -343,7 +343,7 @@
DisableWindow();
SetValidityOfInput( FALSE );
// Wait( 1000 );
DrawBustshotWithFiltering( 6, "cinema", "x", 1, 0, 0, FALSE, 0, 0, 0, 0, 0, 25, 1300, TRUE );
DrawBustshotWithFiltering( 6, "cinema", "x", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 25, 1300, TRUE );
DrawBustshot( 7, "Title02", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 26, 3000, TRUE );
Wait( 2000 );
DrawBustshot( 5, "black", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 25, 3000, TRUE );