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

Browse source
This commit is contained in:
Charles 2001-06-28 21:24:02 +00:00
parent fabee927ad
commit 47c27c870b
6 changed files with 44 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
data/DataCache.scr
View file

@ -16,6 +16,7 @@ scripts/ch2l1_02.dat
scripts/ch2l2_01.dat scripts/ch2l2_01.dat
scripts/ch2l2_02.dat scripts/ch2l2_02.dat
scripts/ch3l1_01.dat scripts/ch3l1_01.dat
scripts/ch3l2_01.dat
scripts/ch3l3_01.dat scripts/ch3l3_01.dat
scripts/ch3l3_02.dat scripts/ch3l3_02.dat
scripts/ch4l3_01.dat scripts/ch4l3_01.dat

3
makefile.gfx
View file

@ -593,7 +593,8 @@ GFX_DATA_OUT += $(MUSIC_ALL_OUT)
# Script stuff.. # Script stuff..
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
SCRIPTS_LIST := ch1l1_01 ch1l1_02 ch1l2_01 ch1l2_02 ch1l2_03 ch1l4_01 ch1l4_02 \ SCRIPTS_LIST := ch1l1_01 ch1l1_02 ch1l2_01 ch1l2_02 ch1l2_03 ch1l4_01 ch1l4_02 \
ch2l1_01 ch2l1_02 ch2l2_01 ch2l2_02 ch3l1_01 ch3l3_01 ch3l3_02 ch4l3_01 ch4l3_02 \ ch2l1_01 ch2l1_02 ch2l2_01 ch2l2_02 ch3l1_01 ch3l2_01 ch3l3_01 \
ch3l3_02 ch4l3_01 ch4l3_02 \
fma_ch1_00 fma_ch1_01 fma_ch1_02 fma_ch1_03 \ fma_ch1_00 fma_ch1_01 fma_ch1_02 fma_ch1_03 \
fma_ch2_00 fma_ch2_01 fma_ch2_02 fma_ch2_03 \ fma_ch2_00 fma_ch2_01 fma_ch2_02 fma_ch2_03 \
fma_ch3_00 fma_ch3_01 fma_ch3_02 \ fma_ch3_00 fma_ch3_01 fma_ch3_02 \

28
source/friend/fsandy.cpp
View file

@ -19,6 +19,10 @@
#include "utils\utils.h" #include "utils\utils.h"
#endif #endif
#ifndef __LEVEL_LEVEL_H__
#include "level\level.h"
#endif
#ifndef __GAME_CONVO_H__ #ifndef __GAME_CONVO_H__
#include "game\convo.h" #include "game\convo.h"
#endif #endif
@ -28,12 +32,34 @@
#endif #endif
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
void CNpcSandyFriend::postInit()
{
switch( CLevel::getCurrentChapter() )
{
case 3:
{
m_conversation = SCRIPTS_CH3L2_01_DAT;
break;
}
default:
{
m_conversation = SCRIPTS_CH1L2_03_DAT;
break;
}
}
}
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
void CNpcSandyFriend::startConderversation() void CNpcSandyFriend::startConderversation()
{ {
if( !CConversation::isActive() ) if( !CConversation::isActive() )
{ {
CConversation::trigger( SCRIPTS_CH1L2_03_DAT ); CConversation::trigger( m_conversation );
} }
} }

4
source/friend/fsandy.h
View file

@ -20,8 +20,12 @@
class CNpcSandyFriend : public CNpcFriend class CNpcSandyFriend : public CNpcFriend
{ {
public:
virtual void postInit();
protected: protected:
virtual void startConderversation(); virtual void startConderversation();
FileEquate m_conversation;
}; };
#endif #endif

6
source/game/convo.cpp
View file

@ -765,6 +765,12 @@ void CConversation::registerConversationLevelScripts(int level)
break; break;
} }
case 2:
{
CConversation::registerConversationScript(SCRIPTS_CH3L2_01_DAT);
break;
}
case 3: case 3:
{ {
CConversation::registerConversationScript(SCRIPTS_CH3L3_01_DAT); CConversation::registerConversationScript(SCRIPTS_CH3L3_01_DAT);

4
users/paul/spongebob project/spongebob project.dsp
View file

@ -2637,6 +2637,10 @@ SOURCE=..\..\..\data\Scripts\ch3l1_01.scr
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\..\data\Scripts\ch3l2_01.scr
# End Source File
# Begin Source File
SOURCE=..\..\..\data\Scripts\ch3l3_01.scr SOURCE=..\..\..\data\Scripts\ch3l3_01.scr
# End Source File # End Source File
# Begin Source File # Begin Source File