source/triggers/tspeech.cpp

@@ -1,6 +1,6 @@
 /*=========================================================================
 
-	tspeech.h
+	tspeech.cpp
 
 	Author:		CRB
 	Created:	
@@ -19,8 +19,36 @@
 #include "sound\sound.h"
 #endif
 
+#ifndef	__GAME_CONVO_H__
+#include "game\convo.h"
+#endif
 
-int		CSpeechTrigger::m_speechRef[9] =
+
+
+
+
+// Makes the speech triggers you proper conversation boxes
+#define __SPEECH_TRIGGERS_AS_CONVERSATIONS__
+
+
+
+
+
+#ifdef	__SPEECH_TRIGGERS_AS_CONVERSATIONS__
+int		CSpeechTrigger::s_speechRef[9] =
+{
+	SCRIPTS_TRIGGERSPEECH_FIRSTNET_DAT,//SPEECH_151,
+	SCRIPTS_TRIGGERSPEECH_FIRSTCORAL_DAT,//SPEECH_152,
+	SCRIPTS_TRIGGERSPEECH_GARYCH2L1_DAT,//SPEECH_153,
+	SCRIPTS_TRIGGERSPEECH_BREAKFLOOR_DAT,//SPEECH_154,
+	SCRIPTS_TRIGGERSPEECH_BUBBLEGEYSER_DAT,//SPEECH_155,
+	0,//SPEECH_156,
+	SCRIPTS_TRIGGERSPEECH_USEBUBBLE_DAT,//SPEECH_157,
+	SCRIPTS_TRIGGERSPEECH_FIRSTBUBBLE_DAT,//SPEECH_158,
+	SCRIPTS_TRIGGERSPEECH_WEIGHT_DAT,//SPEECH_159,
+};
+#else
+int		CSpeechTrigger::s_speechRef[9] =
 {
 	SPEECH_151,
 	SPEECH_152,
@@ -32,6 +60,7 @@ int		CSpeechTrigger::m_speechRef[9] =
 	SPEECH_158,
 	SPEECH_159,
 };
+#endif
 
 /*----------------------------------------------------------------------
 	Function:
@@ -45,7 +74,12 @@ void	CSpeechTrigger::collidedWith(CThing *_thisThing)
 	{
 		case TYPE_PLAYER:
 		{
-			CSoundMediator::playSpeech( m_speechRef[m_data] );
+
+#ifdef	__SPEECH_TRIGGERS_AS_CONVERSATIONS__
+			CConversation::trigger((FileEquate)s_speechRef[m_data]);
+#else
+			CSoundMediator::playSpeech( s_speechRef[m_data] );
+#endif
 			setToShutdown();
 
 			break;