diff options
| author | Max Horn | 2004-03-15 03:33:08 +0000 |
|---|---|---|
| committer | Max Horn | 2004-03-15 03:33:08 +0000 |
| commit | e2617f90a19f81861c09f4bd68da00d0e037a4eb (patch) | |
| tree | ce3c476acf2ccb80fe3f9214afa09d2783228ba3 /scumm/string.cpp | |
| parent | ac11c6231259439b22f886d52cf45e5225c44be9 (diff) | |
| download | scummvm-rg350-e2617f90a19f81861c09f4bd68da00d0e037a4eb.tar.gz scummvm-rg350-e2617f90a19f81861c09f4bd68da00d0e037a4eb.tar.bz2 scummvm-rg350-e2617f90a19f81861c09f4bd68da00d0e037a4eb.zip | |
disambiguate the two talkingActor() methods (one was a getter, one a setter -- reflect that in the name)
svn-id: r13301
Diffstat (limited to 'scumm/string.cpp')
| -rw-r--r-- | scumm/string.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scumm/string.cpp b/scumm/string.cpp index bdd30a0136..3dc4fd14e4 100644 --- a/scumm/string.cpp +++ b/scumm/string.cpp @@ -98,14 +98,14 @@ void ScummEngine::CHARSET_1() { if (!_haveMsg) return; - if (!(_features & GF_NEW_CAMERA) && !(_gameId == GID_ZAK256 && talkingActor() == 0xFF)) { + if (!(_features & GF_NEW_CAMERA) && !(_gameId == GID_ZAK256 && getTalkingActor() == 0xFF)) { if ((camera._dest.x / 8) != (camera._cur.x / 8) || camera._cur.x != camera._last.x) return; } a = NULL; - if (talkingActor() != 0xFF) - a = derefActorSafe(talkingActor(), "CHARSET_1"); + if (getTalkingActor() != 0xFF) + a = derefActorSafe(getTalkingActor(), "CHARSET_1"); if (a && _string[0].overhead != 0) { if (_version <= 5) { |