diff options
| author | Simei Yin | 2017-12-19 21:24:31 +0100 |
|---|---|---|
| committer | Simei Yin | 2017-12-19 22:12:08 +0100 |
| commit | d98016b22293c9f692050bef62e81c1cb70ff1fa (patch) | |
| tree | fba0b94b235671baba7de5e9a75075d011f3ba78 /engines/sludge/people.cpp | |
| parent | a2eb11f464f33b4e2bff1b6c3c0a8d240921f5d2 (diff) | |
| download | scummvm-rg350-d98016b22293c9f692050bef62e81c1cb70ff1fa.tar.gz scummvm-rg350-d98016b22293c9f692050bef62e81c1cb70ff1fa.tar.bz2 scummvm-rg350-d98016b22293c9f692050bef62e81c1cb70ff1fa.zip | |
SLUDGE: Objectify speech manager
Diffstat (limited to 'engines/sludge/people.cpp')
| -rw-r--r-- | engines/sludge/people.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/engines/sludge/people.cpp b/engines/sludge/people.cpp index a6adc4ebfb..c4c0cfe4ea 100644 --- a/engines/sludge/people.cpp +++ b/engines/sludge/people.cpp @@ -28,7 +28,6 @@ #include "sludge/objtypes.h" #include "sludge/region.h" #include "sludge/people.h" -#include "sludge/talk.h" #include "sludge/newfatal.h" #include "sludge/variable.h" #include "sludge/moreio.h" @@ -37,6 +36,7 @@ #include "sludge/zbuffer.h" #include "sludge/sludge.h" #include "sludge/sound.h" +#include "sludge/speech.h" #include "sludge/version.h" #define ANGLEFIX (180.0 / 3.14157) @@ -46,8 +46,6 @@ namespace Sludge { -extern SpeechStruct *speech; - extern VariableStack *noStack; extern int ssgVersion; @@ -202,7 +200,7 @@ bool turnPersonToFace(int thisNum, int direc) { thisPerson->walking = false; thisPerson->spinning = false; turnMeAngle(thisPerson, direc); - setFrames(*thisPerson, (thisPerson == speech->currentTalker) ? ANI_TALK : ANI_STAND); + setFrames(*thisPerson, g_sludge->_speechMan->isCurrentTalker(thisPerson) ? ANI_TALK : ANI_STAND); return true; } return false; |