diff --git a/data/DataCache.scr b/data/DataCache.scr index 3a7733e4f..5ea54dee3 100644 --- a/data/DataCache.scr +++ b/data/DataCache.scr @@ -16,6 +16,7 @@ scripts/ch2l1_02.dat scripts/ch2l2_01.dat scripts/ch2l2_02.dat scripts/ch3l1_01.dat +scripts/ch3l2_01.dat scripts/ch3l3_01.dat scripts/ch3l3_02.dat scripts/ch4l3_01.dat diff --git a/makefile.gfx b/makefile.gfx index 1931413fc..ad46cfa33 100644 --- a/makefile.gfx +++ b/makefile.gfx @@ -593,7 +593,8 @@ GFX_DATA_OUT += $(MUSIC_ALL_OUT) # Script stuff.. #---------------------------------------------------------------------------- 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_ch2_00 fma_ch2_01 fma_ch2_02 fma_ch2_03 \ fma_ch3_00 fma_ch3_01 fma_ch3_02 \ diff --git a/source/friend/fsandy.cpp b/source/friend/fsandy.cpp index fdd3fa712..687eb90bb 100644 --- a/source/friend/fsandy.cpp +++ b/source/friend/fsandy.cpp @@ -19,6 +19,10 @@ #include "utils\utils.h" #endif +#ifndef __LEVEL_LEVEL_H__ +#include "level\level.h" +#endif + #ifndef __GAME_CONVO_H__ #include "game\convo.h" #endif @@ -28,12 +32,34 @@ #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() { if( !CConversation::isActive() ) { - CConversation::trigger( SCRIPTS_CH1L2_03_DAT ); + CConversation::trigger( m_conversation ); } } \ No newline at end of file diff --git a/source/friend/fsandy.h b/source/friend/fsandy.h index 4e6d2c528..55457af49 100644 --- a/source/friend/fsandy.h +++ b/source/friend/fsandy.h @@ -20,8 +20,12 @@ class CNpcSandyFriend : public CNpcFriend { +public: + virtual void postInit(); protected: virtual void startConderversation(); + + FileEquate m_conversation; }; #endif \ No newline at end of file diff --git a/source/game/convo.cpp b/source/game/convo.cpp index 4ecda6b6c..00e909513 100644 --- a/source/game/convo.cpp +++ b/source/game/convo.cpp @@ -765,6 +765,12 @@ void CConversation::registerConversationLevelScripts(int level) break; } + case 2: + { + CConversation::registerConversationScript(SCRIPTS_CH3L2_01_DAT); + break; + } + case 3: { CConversation::registerConversationScript(SCRIPTS_CH3L3_01_DAT); diff --git a/users/paul/spongebob project/spongebob project.dsp b/users/paul/spongebob project/spongebob project.dsp index cd4c0a22a..6f4ea3336 100644 --- a/users/paul/spongebob project/spongebob project.dsp +++ b/users/paul/spongebob project/spongebob project.dsp @@ -2637,6 +2637,10 @@ SOURCE=..\..\..\data\Scripts\ch3l1_01.scr # End Source File # Begin Source File +SOURCE=..\..\..\data\Scripts\ch3l2_01.scr +# End Source File +# Begin Source File + SOURCE=..\..\..\data\Scripts\ch3l3_01.scr # End Source File # Begin Source File