diff options
| author | Max Horn | 2002-09-22 01:17:53 +0000 |
|---|---|---|
| committer | Max Horn | 2002-09-22 01:17:53 +0000 |
| commit | a681eb029e7fc5b0383d5cdfce2c561e8fa221d2 (patch) | |
| tree | 62c79d406f1fdd730eb8000e25a42ecd557a990d /scumm/actor.cpp | |
| parent | 45ce1d111312ec413d6d680092f98a4f49e31556 (diff) | |
| download | scummvm-rg350-a681eb029e7fc5b0383d5cdfce2c561e8fa221d2.tar.gz scummvm-rg350-a681eb029e7fc5b0383d5cdfce2c561e8fa221d2.tar.bz2 scummvm-rg350-a681eb029e7fc5b0383d5cdfce2c561e8fa221d2.zip | |
renamec string -> _string and sentence -> _sentence in class Scumm (I originally reworked StringTab, but then noticed the save game format depends on it <sigh>)
svn-id: r4995
Diffstat (limited to 'scumm/actor.cpp')
| -rw-r--r-- | scumm/actor.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scumm/actor.cpp b/scumm/actor.cpp index d62d20f7d7..7e762a9314 100644 --- a/scumm/actor.cpp +++ b/scumm/actor.cpp @@ -1038,7 +1038,7 @@ void Scumm::actorTalk() if (!_keepText) stopTalk(); _vars[VAR_TALK_ACTOR] = a->number; - if (!string[0].no_talk_anim) { + if (!_string[0].no_talk_anim) { a->startAnimActor(a->talkFrame1); _useTalkAnims = true; } @@ -1049,7 +1049,7 @@ void Scumm::actorTalk() return; if (_vars[VAR_TALK_ACTOR] > 0x7F) { - _charsetColor = (byte)string[0].color; + _charsetColor = (byte)_string[0].color; } else { a = derefActorSafe(_vars[VAR_TALK_ACTOR], "actorTalk(2)"); _charsetColor = a->talkColor; |