diff --git a/Graphics/levels/Chapter01/Level01/Level01.MEX b/Graphics/levels/Chapter01/Level01/Level01.MEX index 8d0fb99ea..74cb0b3a4 100644 Binary files a/Graphics/levels/Chapter01/Level01/Level01.MEX and b/Graphics/levels/Chapter01/Level01/Level01.MEX differ diff --git a/Graphics/levels/Chapter01/Level01/level01.Mep b/Graphics/levels/Chapter01/Level01/level01.Mep index beed0770f..9834e6f7e 100644 Binary files a/Graphics/levels/Chapter01/Level01/level01.Mep and b/Graphics/levels/Chapter01/Level01/level01.Mep differ diff --git a/Graphics/levels/Chapter02/Level01/level01.MEX b/Graphics/levels/Chapter02/Level01/level01.MEX index a05be7838..d8a0fc216 100644 Binary files a/Graphics/levels/Chapter02/Level01/level01.MEX and b/Graphics/levels/Chapter02/Level01/level01.MEX differ diff --git a/Graphics/levels/Chapter02/Level01/level01.Mep b/Graphics/levels/Chapter02/Level01/level01.Mep index 0e007525b..6ed278f32 100644 Binary files a/Graphics/levels/Chapter02/Level01/level01.Mep and b/Graphics/levels/Chapter02/Level01/level01.Mep differ diff --git a/Graphics/levels/Chapter02/Level02/Level02.MEX b/Graphics/levels/Chapter02/Level02/Level02.MEX index 717f7b6ac..a8bcefd7f 100644 Binary files a/Graphics/levels/Chapter02/Level02/Level02.MEX and b/Graphics/levels/Chapter02/Level02/Level02.MEX differ diff --git a/Graphics/levels/Chapter02/Level02/level02.Mep b/Graphics/levels/Chapter02/Level02/level02.Mep index 15dad8b78..88ae64af5 100644 Binary files a/Graphics/levels/Chapter02/Level02/level02.Mep and b/Graphics/levels/Chapter02/Level02/level02.Mep differ diff --git a/Graphics/levels/Chapter02/Level03/Level03.MEX b/Graphics/levels/Chapter02/Level03/Level03.MEX index 63b4e1b46..b3cabeb48 100644 Binary files a/Graphics/levels/Chapter02/Level03/Level03.MEX and b/Graphics/levels/Chapter02/Level03/Level03.MEX differ diff --git a/Graphics/levels/Chapter02/Level03/level03.Mep b/Graphics/levels/Chapter02/Level03/level03.Mep index 1f676fdde..6a21b2728 100644 Binary files a/Graphics/levels/Chapter02/Level03/level03.Mep and b/Graphics/levels/Chapter02/Level03/level03.Mep differ diff --git a/Graphics/levels/Chapter03/Level01/Level01.MEX b/Graphics/levels/Chapter03/Level01/Level01.MEX index 058cb4cce..ff260b3ed 100644 Binary files a/Graphics/levels/Chapter03/Level01/Level01.MEX and b/Graphics/levels/Chapter03/Level01/Level01.MEX differ diff --git a/Graphics/levels/Chapter03/Level01/level01.Mep b/Graphics/levels/Chapter03/Level01/level01.Mep index 82ae495db..c0040dd14 100644 Binary files a/Graphics/levels/Chapter03/Level01/level01.Mep and b/Graphics/levels/Chapter03/Level01/level01.Mep differ diff --git a/Graphics/levels/Chapter03/Level04/Level04.MEX b/Graphics/levels/Chapter03/Level04/Level04.MEX index c88b71fe1..507a31970 100644 Binary files a/Graphics/levels/Chapter03/Level04/Level04.MEX and b/Graphics/levels/Chapter03/Level04/Level04.MEX differ diff --git a/Graphics/levels/Chapter03/Level04/Level04.Mep b/Graphics/levels/Chapter03/Level04/Level04.Mep index 967157453..277ab5939 100644 Binary files a/Graphics/levels/Chapter03/Level04/Level04.Mep and b/Graphics/levels/Chapter03/Level04/Level04.Mep differ diff --git a/Graphics/levels/Chapter04/Level01/level01.Mep b/Graphics/levels/Chapter04/Level01/level01.Mep index b70d822db..966805268 100644 Binary files a/Graphics/levels/Chapter04/Level01/level01.Mep and b/Graphics/levels/Chapter04/Level01/level01.Mep differ diff --git a/Graphics/levels/Chapter05/Level02/Level02.MEX b/Graphics/levels/Chapter05/Level02/Level02.MEX index ee15f38f1..63826b21b 100644 Binary files a/Graphics/levels/Chapter05/Level02/Level02.MEX and b/Graphics/levels/Chapter05/Level02/Level02.MEX differ diff --git a/Graphics/levels/Chapter05/Level02/level02.Mep b/Graphics/levels/Chapter05/Level02/level02.Mep index d511b802d..11701d3db 100644 Binary files a/Graphics/levels/Chapter05/Level02/level02.Mep and b/Graphics/levels/Chapter05/Level02/level02.Mep differ diff --git a/Graphics/levels/Chapter06/Level01/Level01.MEX b/Graphics/levels/Chapter06/Level01/Level01.MEX index e22f19f70..6404402ea 100644 Binary files a/Graphics/levels/Chapter06/Level01/Level01.MEX and b/Graphics/levels/Chapter06/Level01/Level01.MEX differ diff --git a/Graphics/levels/Chapter06/Level01/level01.Mep b/Graphics/levels/Chapter06/Level01/level01.Mep index 38ab74f1d..d308a0be5 100644 Binary files a/Graphics/levels/Chapter06/Level01/level01.Mep and b/Graphics/levels/Chapter06/Level01/level01.Mep differ diff --git a/source/game/convo.cpp b/source/game/convo.cpp index f9076dfad..5e957ab19 100644 --- a/source/game/convo.cpp +++ b/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}, diff --git a/source/triggers/trigger.cpp b/source/triggers/trigger.cpp index 61fdf055a..6e591460c 100644 --- a/source/triggers/trigger.cpp +++ b/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; } diff --git a/source/triggers/tspeech.cpp b/source/triggers/tspeech.cpp index 36b92ee5a..5c115f9ea 100644 --- a/source/triggers/tspeech.cpp +++ b/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; diff --git a/source/triggers/tspeech.h b/source/triggers/tspeech.h index c2a1c192d..2fed9b67a 100644 --- a/source/triggers/tspeech.h +++ b/source/triggers/tspeech.h @@ -47,6 +47,7 @@ protected: virtual void collidedWith(CThing *_thisThing); int m_data; + static int m_speechRef[9]; }; /*----------------------------------------------------------------------