data/DataCache.scr

@@ -82,6 +82,7 @@ scripts/triggerspeech_156.dat
 scripts/triggerspeech_157.dat
 scripts/triggerspeech_158.dat
 scripts/triggerspeech_159.dat
+scripts/triggerspeech_028.dat
 
 translations/swe.dat
 translations/dut.dat

data/translations/text.dat

@@ -463,6 +463,8 @@ eng=I got it! Well, celebration time is over! Now back to Bikini Bottom to add t
 ; Speech trigger texts
 ; ---------------------------------------------------------------
 
+[STR__INGAME__TRIGGERSPEECH_028]
+eng=Now Gary, follow me. I’ll protect you!! Just head for your food Gary!!
 [STR__INGAME__TRIGGERSPEECH_151]
 eng=Hey, I can use this net to catch jellyfish and throw them at those annoying critters!
 [STR__INGAME__TRIGGERSPEECH_152]
@@ -480,7 +482,7 @@ eng=I can make bubbles! And what do you know, I can jump on them!
 [STR__INGAME__TRIGGERSPEECH_158]
 eng=A few bubbles should get me up there...
 [STR__INGAME__TRIGGERSPEECH_159]
-eng=I cant't lift that.. hmmmm. Those pulleys should do the trick.
+eng=I can't lift that.. hmmmm. Those pulleys should do the trick.
 
 
 

makefile.gfx

@@ -631,7 +631,7 @@ SCRIPTS_LIST		:=	ch1l1_01 ch1l1_02 ch1l2_01 ch1l2_02 ch1l2_03 ch1l4_01 ch1l4_02
 						c5l1_celebrate c5l2_celebrate c5l3_celebrate c5l4_celebrate \
 						triggerspeech_151 triggerspeech_152 triggerspeech_153 triggerspeech_154 \
 						triggerspeech_155 triggerspeech_156 triggerspeech_157 triggerspeech_158 \
-						triggerspeech_159
+						triggerspeech_159 triggerspeech_028
  
 SCRIPTS_IN_DIR		:=	$(GAME_DATA_DIR)/scripts
  

source/friend/fgary.cpp

@@ -31,6 +31,11 @@
 #include "system\vid.h"
 #endif
 
+#ifndef	__GAME_CONVO_H__
+#include "game\convo.h"
+#endif
+
+
 #ifndef __ANIM_GARY_HEADER__
 #include <ACTOR_GARY_Anim.h>
 #endif
@@ -457,7 +462,7 @@ void CNpcGaryFriend::start()
 			m_garySpeech = true;
 			m_garyMeow = false;
 			m_garySB = true;
-			CSoundMediator::playSpeech( SPEECH_028 );
+			CConversation::trigger(SCRIPTS_TRIGGERSPEECH_028_DAT);
 		}
 		else
 		{

source/game/convo.cpp

@@ -125,7 +125,7 @@ const sSpeechTable	SpeechTable[]=
 {SPEECH_025,STR__INGAME__FMA_C2_SB1},
 {SPEECH_026,STR__INGAME__CH2__L1__KRUSTY1},
 {SPEECH_027,STR__INGAME__CH2__L1__KRUSTY2},
-{SPEECH_028,-1},
+{SPEECH_028,STR__INGAME__TRIGGERSPEECH_028},
 {SPEECH_029,-1},	// Another Meow
 {SPEECH_030,STR__INGAME__CH2__L1__SBCELEBRATE},
 {SPEECH_031,STR__INGAME__CH2__L2__PATRICK1},
@@ -821,6 +821,7 @@ void CConversation::registerConversationLevelScripts(int level)
 					registerConversationScript(SCRIPTS_CH2L1_01_DAT);
 					registerConversationScript(SCRIPTS_CH2L1_02_DAT);
 					registerConversationScript(SCRIPTS_C2L1_CELEBRATE_DAT);
+					registerConversationScript(SCRIPTS_TRIGGERSPEECH_028_DAT);	// gary
 					break;
 				}
 
@@ -961,6 +962,7 @@ void CConversation::registerConversationLevelScripts(int level)
 				case 5:
 				{
 					registerConversationScript(SCRIPTS_TRIGGERSPEECH_159_DAT);	// weight
+					registerConversationScript(SCRIPTS_TRIGGERSPEECH_028_DAT);	// gary
 					break;
 				}
 

users/paul/spongebob project/spongebob project.dsp

@@ -2956,6 +2956,10 @@ SOURCE=..\..\..\data\scripts\fma_plankton.scr
 # PROP Default_Filter ""
 # Begin Source File
 
+SOURCE=..\..\..\data\scripts\triggerspeech_028.scr
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\data\scripts\triggerspeech_151.scr
 # End Source File
 # Begin Source File