From c84c8dfdc9ddac53f06753a29df765c6736471f3 Mon Sep 17 00:00:00 2001 From: Paul Date: Mon, 23 Jul 2001 23:12:06 +0000 Subject: [PATCH] --- source/fma/fma.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/source/fma/fma.cpp b/source/fma/fma.cpp index 2344ec3ce..62a0af7e5 100644 --- a/source/fma/fma.cpp +++ b/source/fma/fma.cpp @@ -849,7 +849,7 @@ static const int s_FMAC3EndScript[]= SC_SET_ACTOR_POSITION, FMA_ACTOR_SPONGEBOB,270*16,30*16, SC_WALK_ACTOR_TO_POSITION, FMA_ACTOR_SPONGEBOB,260*16,30*16,40, SC_WAIT_ON_ACTOR_STOP, FMA_ACTOR_SPONGEBOB, - SC_WALK_ACTOR_TO_POSITION, FMA_ACTOR_SPONGEBOB,208*16,30*16,248, + SC_WALK_ACTOR_TO_POSITION, FMA_ACTOR_SPONGEBOB,210*16,30*16,248, SC_MOVE_CAMERA_TO, 197*16,18*16,200, SC_WAIT_ON_CAMERA_STOP, SC_WAIT_ON_ACTOR_STOP, FMA_ACTOR_SPONGEBOB, @@ -859,7 +859,8 @@ static const int s_FMAC3EndScript[]= SC_SET_ACTOR_ANIM_STATE, FMA_ACTOR_BB,FMA_ANIM_UNHIDE,0, SC_WAIT_ON_ACTOR_ANIM, FMA_ACTOR_BB, SC_WAIT_ON_TIMER, 30, - SC_CARRY_ITEM, 0,FMA_ACTOR_BB, + SC_THROW_ITEM_TO_ACTOR, 0,FMA_ACTOR_BB,28,60, + SC_WAIT_ON_THROWN_ITEM, 0, SC_WAIT_ON_CONVERSATION, SCRIPTS_FMA_CH4_02_DAT, // Scene 8 - SB Leaves @@ -910,10 +911,11 @@ static const int s_FMAC4EndScript[]= SC_WAIT_ON_CONVERSATION, SCRIPTS_FMA_CH5_00_DAT, // SB throws bar thru window - SC_THROW_ITEM_TO_ACTOR, 0,FMA_ACTOR_BB,64,120, + SC_THROW_ITEM_TO_ACTOR, 0,FMA_ACTOR_BB,50,120, SC_WAIT_ON_THROWN_ITEM, 0, // BB comes to Porthole + SC_WAIT_ON_TIMER, 60*3, SC_WALK_ACTOR_TO_POSITION, FMA_ACTOR_BB,374*16,30*16,60, SC_WAIT_ON_ACTOR_STOP, FMA_ACTOR_BB, SC_WAIT_ON_CONVERSATION, SCRIPTS_FMA_CH5_01_DAT, @@ -990,7 +992,9 @@ static const int s_FMAC5EndScript[]= 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_CARRY_ITEM, 0,FMA_ACTOR_SPONGEBOB, + SC_THROW_ITEM_TO_ACTOR, 0,FMA_ACTOR_SPONGEBOB,50,120, + SC_WAIT_ON_THROWN_ITEM, 0, + SC_WAIT_ON_TIMER, 60*1, SC_SET_ACTOR_ANIM_STATE, FMA_ACTOR_SPONGEBOB,FMA_ANIM_QUICKEXIT,0, SC_SET_ACTOR_FACING, FMA_ACTOR_SPONGEBOB,0,