diff options
| author | Simei Yin | 2018-04-15 21:10:02 +0200 |
|---|---|---|
| committer | Simei Yin | 2018-04-15 22:10:41 +0200 |
| commit | 7c74e81e0ac7f9482c3732cb9305929d9e83a0c4 (patch) | |
| tree | dca2e59cd323a64cfb70a5a996b3da0ba223bd20 /engines/sludge/speech.cpp | |
| parent | 756a1096d8f07bf8dec93be126f8b702a884daa3 (diff) | |
| download | scummvm-rg350-7c74e81e0ac7f9482c3732cb9305929d9e83a0c4.tar.gz scummvm-rg350-7c74e81e0ac7f9482c3732cb9305929d9e83a0c4.tar.bz2 scummvm-rg350-7c74e81e0ac7f9482c3732cb9305929d9e83a0c4.zip | |
SLUDGE: Objectify PeopleManager
Diffstat (limited to 'engines/sludge/speech.cpp')
| -rw-r--r-- | engines/sludge/speech.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/sludge/speech.cpp b/engines/sludge/speech.cpp index 6324da88cc..c688bf312d 100644 --- a/engines/sludge/speech.cpp +++ b/engines/sludge/speech.cpp @@ -61,7 +61,7 @@ void SpeechManager::kill() { } if (_speech->currentTalker) { - makeSilent(*(_speech->currentTalker)); + g_sludge->_peopleMan->makeSilent(*(_speech->currentTalker)); _speech->currentTalker = NULL; } @@ -176,7 +176,7 @@ int SpeechManager::wrapSpeechPerson(const Common::String &theText, OnScreenPerso - thePerson.thisType->speechGap, thePerson.thisType->wrapSpeech, sampleFile); if (animPerson) { - makeTalker(thePerson); + g_sludge->_peopleMan->makeTalker(thePerson); _speech->currentTalker = &thePerson; } return i; @@ -188,7 +188,7 @@ int SpeechManager::wrapSpeech(const Common::String &theText, int objT, int sampl int cameraY = g_sludge->_gfxMan->getCamY(); _speech->lookWhosTalking = objT; - OnScreenPerson *thisPerson = findPerson(objT); + OnScreenPerson *thisPerson = g_sludge->_peopleMan->findPerson(objT); if (thisPerson) { setObjFontColour(thisPerson->thisType); i = wrapSpeechPerson(theText, *thisPerson, sampleFile, animPerson); @@ -274,7 +274,7 @@ bool SpeechManager::load(Common::SeekableReadStream *stream) { _speech->lookWhosTalking = stream->readUint16BE(); if (stream->readByte()) { - _speech->currentTalker = findPerson(stream->readUint16BE()); + _speech->currentTalker = g_sludge->_peopleMan->findPerson(stream->readUint16BE()); } else { _speech->currentTalker = NULL; } |