diff --git a/source/fma/fma.cpp b/source/fma/fma.cpp index a3991a444..f7436788a 100644 --- a/source/fma/fma.cpp +++ b/source/fma/fma.cpp @@ -750,86 +750,8 @@ static const int s_FMAC5EndScript[]= static const int s_FMAPlanktonScript[]= { - SC_REGISTER_CONVERSATION, SCRIPTS_FMA_CH6_00_DAT, - SC_REGISTER_CONVERSATION, SCRIPTS_FMA_CH6_01_DAT, - SC_REGISTER_CONVERSATION, SCRIPTS_FMA_CH6_02_DAT, - SC_REGISTER_CONVERSATION, SCRIPTS_FMA_CH6_03_DAT, - -// Scene 1 - Shade Shoals - SC_SNAP_CAMERA_TO, 4*16,18*16, - SC_WAIT_ON_TIMER, 30, - -// Scene 2 - SB arrives outside Shady Shoals - SC_SET_ACTOR_ANIM_STATE, FMA_ACTOR_SPONGEBOB,FMA_ANIM_WALK,1, - SC_SET_ACTOR_POSITION, FMA_ACTOR_SPONGEBOB,40*16,30*16, - SC_SET_ACTOR_FACING, FMA_ACTOR_SPONGEBOB,1, - SC_SET_ACTOR_VISIBILITY, FMA_ACTOR_SPONGEBOB,true, - - SC_WALK_ACTOR_TO_POSITION, FMA_ACTOR_SPONGEBOB,16*16,30*16,96, - SC_WAIT_ON_ACTOR_STOP, FMA_ACTOR_SPONGEBOB, - SC_SET_ACTOR_ANIM_STATE, FMA_ACTOR_SPONGEBOB,FMA_ANIM_IDLE,1, - SC_WAIT_ON_CONVERSATION, SCRIPTS_FMA_CH6_00_DAT, - -// Scene 3 - SB Fixing TV - SC_SET_ACTOR_ANIM_STATE, FMA_ACTOR_MM,FMA_ANIM_IDLE,1, - SC_SET_ACTOR_POSITION, FMA_ACTOR_MM,224*16,30*16, - SC_SET_ACTOR_FACING, FMA_ACTOR_MM,1, - SC_SET_ACTOR_VISIBILITY, FMA_ACTOR_MM,true, - - SC_SET_ACTOR_ANIM_STATE, FMA_ACTOR_BB,FMA_ANIM_IDLE,1, - SC_SET_ACTOR_POSITION, FMA_ACTOR_BB,220*16,30*16, - SC_SET_ACTOR_FACING, FMA_ACTOR_BB,1, - SC_SET_ACTOR_VISIBILITY, FMA_ACTOR_BB,true, - - SC_SET_ACTOR_POSITION, FMA_ACTOR_SPONGEBOB,205*16,30*16, - - SC_SNAP_CAMERA_TO, 197*16,18*16, - - SC_SET_ACTOR_ANIM_STATE, FMA_ACTOR_SPONGEBOB,FMA_ANIM_FIXTV,1, - SC_WAIT_ON_TIMER, 60, - SC_WAIT_ON_CONVERSATION, SCRIPTS_FMA_CH6_01_DAT, - SC_WAIT_ON_TIMER, 60, - -// Scene 4 - Goes to BB, and collects his prize - SC_WALK_ACTOR_TO_POSITION, FMA_ACTOR_SPONGEBOB,216*16,30*16,44, - SC_SET_ACTOR_FACING, FMA_ACTOR_SPONGEBOB,0, - SC_SET_ACTOR_ANIM_STATE, FMA_ACTOR_SPONGEBOB,FMA_ANIM_WALK,1, - SC_WAIT_ON_ACTOR_STOP, FMA_ACTOR_SPONGEBOB, - SC_SET_ACTOR_ANIM_STATE, FMA_ACTOR_SPONGEBOB,FMA_ANIM_IDLE,1, - SC_WAIT_ON_CONVERSATION, SCRIPTS_FMA_CH6_02_DAT, - SC_SET_ACTOR_ANIM_STATE, FMA_ACTOR_SPONGEBOB,FMA_ANIM_QUICKEXIT,0, - SC_SET_ACTOR_FACING, FMA_ACTOR_SPONGEBOB,0, - SC_WAIT_ON_ACTOR_ANIM, FMA_ACTOR_SPONGEBOB, - SC_WALK_ACTOR_TO_POSITION, FMA_ACTOR_SPONGEBOB,240*16,30*16,40, - SC_SET_ACTOR_ANIM_STATE, FMA_ACTOR_SPONGEBOB,FMA_ANIM_WALK,1, - SC_WAIT_ON_ACTOR_STOP, FMA_ACTOR_SPONGEBOB, - -// Scene 5 - SB leaves Shady Shoals - SC_SNAP_CAMERA_TO, 4*16,18*16, - SC_WAIT_ON_TIMER, 30, - - SC_SET_ACTOR_ANIM_STATE, FMA_ACTOR_SPONGEBOB,FMA_ANIM_WALK,1, - SC_SET_ACTOR_POSITION, FMA_ACTOR_SPONGEBOB,4*16,30*16, - SC_SET_ACTOR_FACING, FMA_ACTOR_SPONGEBOB,0, - - SC_WALK_ACTOR_TO_POSITION, FMA_ACTOR_SPONGEBOB,40*16,30*16,72, - SC_WAIT_ON_ACTOR_STOP, FMA_ACTOR_SPONGEBOB, - -// Scene 6 - Back in shady - SC_SET_ACTOR_ANIM_STATE, FMA_ACTOR_MM,FMA_ANIM_SIT,1, - SC_SET_ACTOR_POSITION, FMA_ACTOR_MM,208*16,(30*16)+8, - SC_SET_ACTOR_FACING, FMA_ACTOR_MM,0, - SC_SET_ACTOR_ANIM_STATE, FMA_ACTOR_BB,FMA_ANIM_SIT,1, - SC_SET_ACTOR_POSITION, FMA_ACTOR_BB,211*16,(30*16)+8, - SC_SET_ACTOR_FACING, FMA_ACTOR_BB,0, - SC_SNAP_CAMERA_TO, 197*16,18*16, - SC_WAIT_ON_TIMER, 120, - -// Scene 7 - TV goes pop - -// Scene 8 - Outside, MM & BB SCREEEEEEEEEEEEEEEAM - SC_SNAP_CAMERA_TO, 4*16,18*16, - SC_WAIT_ON_CONVERSATION, SCRIPTS_FMA_CH6_03_DAT, + SC_SNAP_CAMERA_TO, 0*16,0*16, + SC_WAIT_ON_TIMER, 300000, SC_STOP }; @@ -911,6 +833,8 @@ void CFmaScene::init() m_pc=s_fmaScripts[s_chosenScript]; CFader::setFadingIn(); + + CSoundMediator::playSong(); }