zydronium/SBSPSS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Browse source
This commit is contained in:
Paul 2001-08-07 16:36:24 +00:00
parent 4fee7f56d3
commit 15a1f901ab
2 changed files with 37 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
data/Scripts/fma_party.scr
View file

@ -21,13 +21,6 @@ do
} }
while(_getResponse()==ANSWER_NONE); while(_getResponse()==ANSWER_NONE);
_setText(CHAR_JACKCUSTARD,STR__INGAME__FMA_PARTY_VO0);
_setResponseOptions(QUESTION_OK);
do
{
pause;
}
while(_getResponse()==ANSWER_NONE);
; Happy birthday! ; Happy birthday!
_setText(CHAR_SPONGEBOB,STR__INGAME__FMA_PARTY_SB); _setText(CHAR_SPONGEBOB,STR__INGAME__FMA_PARTY_SB);
@ -94,4 +87,16 @@ do
} }
while(_getResponse()==ANSWER_NONE); while(_getResponse()==ANSWER_NONE);
; Take a picture
_setText(CHAR_JACKCUSTARD,STR__INGAME__FMA_PARTY_VO0);
_setResponseOptions(QUESTION_OK);
do
{
pause;
}
while(_getResponse()==ANSWER_NONE);
stop; stop;

27
source/fma/fma.cpp
View file

@ -209,6 +209,8 @@ typedef enum
SC_SET_FADE_TO_BLACK, // SC_SET_FADE_TO_BLACK, //
SC_SET_FADE_TO_WHITE, // SC_SET_FADE_TO_WHITE, //
SC_SET_FADE_FROM_WHITE, //
SC_SET_DRAW_SCREEN_AS_WHITE,// on/off
SC_SNAP_CAMERA_TO, // x,y SC_SNAP_CAMERA_TO, // x,y
SC_MOVE_CAMERA_TO, // x,y,frames SC_MOVE_CAMERA_TO, // x,y,frames
@ -1170,8 +1172,17 @@ static const int s_FMAPartyScript[]=
SC_WAIT_ON_TIMER, 60*2, SC_WAIT_ON_TIMER, 60*2,
SC_WAIT_ON_CONVERSATION, SCRIPTS_FMA_PARTY_DAT, SC_WAIT_ON_CONVERSATION, SCRIPTS_FMA_PARTY_DAT,
SC_WAIT_ON_TIMER, 60*2,
SC_SET_GLOBAL_ANIMATION, false, SC_SET_GLOBAL_ANIMATION, false,
SC_WAIT_ON_TIMER, 60*10, SC_WAIT_ON_TIMER, 60*1,
SC_SET_DRAW_SCREEN_AS_WHITE,true,
SC_WAIT_ON_TIMER, 60*1,
SC_SET_FADE_FROM_WHITE,
SC_SET_DRAW_SCREEN_AS_WHITE,false,
SC_WAIT_ON_TIMER, 60*5,
SC_STOP SC_STOP
}; };
@ -1190,7 +1201,7 @@ static const int *s_fmaScripts[CFmaScene::NUM_FMA_SCRIPTS]=
int s_chosenScript=CFmaScene::FMA_SCRIPT__PLANKTON; int s_chosenScript=CFmaScene::FMA_SCRIPT__PARTY;
/*---------------------------------------------------------------------- /*----------------------------------------------------------------------
@ -1694,6 +1705,16 @@ void CFmaScene::startNextScriptCommand()
CFader::setFadingOut(CFader::WHITE_FADE); CFader::setFadingOut(CFader::WHITE_FADE);
break; break;
case SC_SET_FADE_FROM_WHITE: //
m_pc++;
CFader::setFadingIn(CFader::WHITE_FADE);
break;
case SC_SET_DRAW_SCREEN_AS_WHITE:// on/off
m_pc++;
m_drawScreenAsWhite=*m_pc++;
break;
case SC_SNAP_CAMERA_TO: // x,y case SC_SNAP_CAMERA_TO: // x,y
m_pc++; m_pc++;
m_cameraPos.vx=*m_pc++; m_cameraPos.vx=*m_pc++;
@ -1921,6 +1942,8 @@ void CFmaScene::processCurrentScriptCommand()
case SC_SET_NEXT_FMA_NUMBER: // fmaNumber case SC_SET_NEXT_FMA_NUMBER: // fmaNumber
case SC_SET_FADE_TO_BLACK: // case SC_SET_FADE_TO_BLACK: //
case SC_SET_FADE_TO_WHITE: // case SC_SET_FADE_TO_WHITE: //
case SC_SET_FADE_FROM_WHITE: //
case SC_SET_DRAW_SCREEN_AS_WHITE:// on/off
case SC_SNAP_CAMERA_TO: // x,y case SC_SNAP_CAMERA_TO: // x,y
case SC_MOVE_CAMERA_TO: // x,y,frames case SC_MOVE_CAMERA_TO: // x,y,frames
case SC_REGISTER_CONVERSATION: // scriptId case SC_REGISTER_CONVERSATION: // scriptId