Mirrors/SBSPSS
1
0
Fork 0
Code Releases Activity

Browse Source
This commit is contained in:
Daveo 2001-07-05 22:26:42 +00:00
parent 19043ee256
commit dbf746a287
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
source/fma/fma.cpp
View File

@ -650,6 +650,8 @@ static const int s_FMAC1EndScript[]=
SC_SET_ACTOR_POSITION, FMA_ACTOR_BB,211*16,(30*16)+8,
SC_SET_ACTOR_FACING, FMA_ACTOR_BB,1,
SC_SET_ACTOR_VISIBILITY, FMA_ACTOR_BB,true,
SC_CREATE_FX, 0,207*16,(26*16),CFX::FX_TYPE_ZZZZ,
SC_CREATE_FX, 1,211*16,(26*16),CFX::FX_TYPE_ZZZZ,
SC_SNAP_CAMERA_TO, 197*16,18*16,
SC_WAIT_ON_TIMER, 30,
@ -672,21 +674,24 @@ static const int s_FMAC1EndScript[]=
SC_MOVE_CAMERA_TO, 210*16,18*16,120,
SC_WAIT_ON_CAMERA_STOP,
SC_WAIT_ON_ACTOR_STOP, FMA_ACTOR_SPONGEBOB,
SC_SET_ACTOR_ANIM_STATE, FMA_ACTOR_SPONGEBOB,FMA_ANIM_IDLE,1,
SC_SET_ACTOR_ANIM_STATE, FMA_ACTOR_SPONGEBOB,FMA_ANIM_STUMBLE,0,
SC_THROW_ITEM_TO_ACTOR, 0,FMA_ACTOR_MM,48,120,
SC_WAIT_ON_CONVERSATION, SCRIPTS_FMA_CH2_01_DAT,
// scene 6 - sarnie flys thru the air
// SC_SPRITE_SHIT
SC_CARRY_ITEM, 0,FMA_ACTOR_MM,
SC_MOVE_CAMERA_TO, 197*16,18*16,120,
SC_WAIT_ON_CAMERA_STOP,
// Scene 7 - MM Eats sarnie
SC_WAIT_ON_ACTOR_ANIM, FMA_ACTOR_SPONGEBOB,
SC_SET_ACTOR_ANIM_STATE, FMA_ACTOR_SPONGEBOB,FMA_ANIM_WALK,1,
SC_WALK_ACTOR_TO_POSITION, FMA_ACTOR_SPONGEBOB,216*16,30*16,56,
SC_WAIT_ON_CAMERA_STOP,
SC_WAIT_ON_THROWN_ITEM, 0,
SC_CARRY_ITEM, 0,FMA_ACTOR_MM,
// Scene 7 - MM Eats sarnie
SC_WAIT_ON_ACTOR_STOP, FMA_ACTOR_SPONGEBOB,
SC_SET_ACTOR_ANIM_STATE, FMA_ACTOR_SPONGEBOB,FMA_ANIM_IDLE,1,
SC_KILL_FX, 1,
SC_SET_ACTOR_ANIM_STATE, FMA_ACTOR_BB,FMA_ANIM_SITLOOKLEFT,1,
SC_SET_ACTOR_FACING, FMA_ACTOR_BB,0,
SC_WAIT_ON_TIMER, 30,
@ -700,7 +705,7 @@ static const int s_FMAC1EndScript[]=
SC_WAIT_ON_ACTOR_ANIM, FMA_ACTOR_SPONGEBOB,
SC_SET_ACTOR_ANIM_STATE, FMA_ACTOR_SPONGEBOB,FMA_ANIM_WALK,1,
SC_WALK_ACTOR_TO_POSITION, FMA_ACTOR_SPONGEBOB,240*16,30*16,40,
SC_SET_ACTOR_ANIM_STATE, FMA_ACTOR_BB,FMA_ANIM_RUBHEAD,1,
// SC_SET_ACTOR_ANIM_STATE, FMA_ACTOR_BB,FMA_ANIM_RUBHEAD,1,
SC_WAIT_ON_ACTOR_STOP, FMA_ACTOR_SPONGEBOB,
SC_STOP
};
@ -722,15 +727,17 @@ static const int s_FMAC2EndScript[]=
SC_WAIT_ON_TIMER, 60*2,
// Scene 2 - inside Shady Shoals
SC_SET_ACTOR_ANIM_STATE, FMA_ACTOR_MM,FMA_ANIM_SIT,1,
SC_SET_ACTOR_ANIM_STATE, FMA_ACTOR_MM,FMA_ANIM_SITASLEEP,1,
SC_SET_ACTOR_POSITION, FMA_ACTOR_MM,208*16,(30*16)+8,
SC_SET_ACTOR_FACING, FMA_ACTOR_MM,0,
SC_SET_ACTOR_VISIBILITY, FMA_ACTOR_MM,true,
SC_SET_ACTOR_ANIM_STATE, FMA_ACTOR_BB,FMA_ANIM_SIT,1,
SC_SET_ACTOR_ANIM_STATE, FMA_ACTOR_BB,FMA_ANIM_SITASLEEP,1,
SC_SET_ACTOR_POSITION, FMA_ACTOR_BB,211*16,(30*16)+8,
SC_SET_ACTOR_FACING, FMA_ACTOR_BB,0,
SC_SET_ACTOR_VISIBILITY, FMA_ACTOR_BB,true,
SC_CREATE_FX, 0,207*16,(26*16),CFX::FX_TYPE_ZZZZ,
SC_CREATE_FX, 1,211*16,(26*16),CFX::FX_TYPE_ZZZZ,
SC_SNAP_CAMERA_TO, 197*16,18*16,
SC_WAIT_ON_TIMER, 60,
@ -757,6 +764,7 @@ static const int s_FMAC2EndScript[]=
SC_CARRY_ITEM, 0,FMA_ACTOR_BB,
// Scene 7 - BB gives new task
SC_KILL_FX, 1,
SC_SET_ACTOR_ANIM_STATE, FMA_ACTOR_BB,FMA_ANIM_SITLOOKLEFT,1,
SC_WAIT_ON_TIMER, 30,
SC_WAIT_ON_CONVERSATION, SCRIPTS_FMA_CH3_01_DAT,
@ -897,7 +905,8 @@ static const int s_FMAC4EndScript[]=
SC_WAIT_ON_CONVERSATION, SCRIPTS_FMA_CH5_00_DAT,
// SB throws bar thru window
SC_CARRY_ITEM, 0,FMA_ACTOR_BB,
SC_THROW_ITEM_TO_ACTOR, 0,FMA_ACTOR_BB,64,120,
SC_WAIT_ON_THROWN_ITEM, 0,
// BB comes to Porthole
SC_WALK_ACTOR_TO_POSITION, FMA_ACTOR_BB,374*16,30*16,60,
@ -1336,7 +1345,7 @@ void CFmaScene::render()
}
pos.vy+=s_actorGraphicsData[item->m_Actor].m_ItemOfs.vy;
}
CGameScene::getSpriteBank()->printFT4(item->m_Frame,pos.vx,pos.vy,item->m_facing,0,OTPOS__PICKUP_POS-1);
CGameScene::getSpriteBank()->printFT4(item->m_Frame,pos.vx,pos.vy,item->m_facing,0,OTPOS__PICKUP_POS-3);
}
}