source/game/convo.cpp

@@ -250,8 +250,7 @@ const sSpeechTable	SpeechTable[]=
 {SPEECH_150,-1},
 {SPEECH_151,-1},
 {SPEECH_152,-1},
-{SPEECH_153A,-1},
-{SPEECH_153B,-1},
+{SPEECH_153,-1},
 {SPEECH_154,-1},
 {SPEECH_155,-1},
 {SPEECH_156,-1},

source/triggers/trigger.cpp

@@ -367,7 +367,7 @@ CTrigger	*trigger;
 		{
 			trigger = (CSpeechTrigger*)new("SpeechTrigger") CSpeechTrigger();
 			CSpeechTrigger *speechTrigger = (CSpeechTrigger*) trigger;
-			speechTrigger->setData(0);
+			speechTrigger->setData(1);
 			break;
 		}
 
@@ -375,7 +375,7 @@ CTrigger	*trigger;
 		{
 			trigger = (CSpeechTrigger*)new("SpeechTrigger") CSpeechTrigger();
 			CSpeechTrigger *speechTrigger = (CSpeechTrigger*) trigger;
-			speechTrigger->setData(0);
+			speechTrigger->setData(2);
 			break;
 		}
 
@@ -383,7 +383,7 @@ CTrigger	*trigger;
 		{
 			trigger = (CSpeechTrigger*)new("SpeechTrigger") CSpeechTrigger();
 			CSpeechTrigger *speechTrigger = (CSpeechTrigger*) trigger;
-			speechTrigger->setData(0);
+			speechTrigger->setData(3);
 			break;
 		}
 
@@ -391,7 +391,7 @@ CTrigger	*trigger;
 		{
 			trigger = (CSpeechTrigger*)new("SpeechTrigger") CSpeechTrigger();
 			CSpeechTrigger *speechTrigger = (CSpeechTrigger*) trigger;
-			speechTrigger->setData(0);
+			speechTrigger->setData(4);
 			break;
 		}
 
@@ -399,7 +399,7 @@ CTrigger	*trigger;
 		{
 			trigger = (CSpeechTrigger*)new("SpeechTrigger") CSpeechTrigger();
 			CSpeechTrigger *speechTrigger = (CSpeechTrigger*) trigger;
-			speechTrigger->setData(0);
+			speechTrigger->setData(5);
 			break;
 		}
 
@@ -407,7 +407,7 @@ CTrigger	*trigger;
 		{
 			trigger = (CSpeechTrigger*)new("SpeechTrigger") CSpeechTrigger();
 			CSpeechTrigger *speechTrigger = (CSpeechTrigger*) trigger;
-			speechTrigger->setData(0);
+			speechTrigger->setData(6);
 			break;
 		}
 
@@ -415,7 +415,7 @@ CTrigger	*trigger;
 		{
 			trigger = (CSpeechTrigger*)new("SpeechTrigger") CSpeechTrigger();
 			CSpeechTrigger *speechTrigger = (CSpeechTrigger*) trigger;
-			speechTrigger->setData(0);
+			speechTrigger->setData(7);
 			break;
 		}
 
@@ -423,7 +423,7 @@ CTrigger	*trigger;
 		{
 			trigger = (CSpeechTrigger*)new("SpeechTrigger") CSpeechTrigger();
 			CSpeechTrigger *speechTrigger = (CSpeechTrigger*) trigger;
-			speechTrigger->setData(0);
+			speechTrigger->setData(8);
 			break;
 		}
 

source/triggers/tspeech.cpp

@@ -15,8 +15,24 @@
 #include "triggers\tspeech.h"
 #endif
 
+#ifndef	__SOUND_SOUND_H__
+#include "sound\sound.h"
+#endif
 
 
+int		CSpeechTrigger::m_speechRef[9] =
+{
+	SPEECH_151,
+	SPEECH_152,
+	SPEECH_153,
+	SPEECH_154,
+	SPEECH_155,
+	SPEECH_156,
+	SPEECH_157,
+	SPEECH_158,
+	SPEECH_159,
+};
+
 /*----------------------------------------------------------------------
 	Function:
 	Purpose:
@@ -29,6 +45,7 @@ void	CSpeechTrigger::collidedWith(CThing *_thisThing)
 	{
 		case TYPE_PLAYER:
 		{
+			CSoundMediator::playSpeech( m_speechRef[m_data] );
 			setToShutdown();
 
 			break;

source/triggers/tspeech.h

@@ -47,6 +47,7 @@ protected:
 	virtual void		collidedWith(CThing *_thisThing);
 
 	int					m_data;
+	static int			m_speechRef[9];
 };
 
 /*----------------------------------------------------------------------