aboutsummaryrefslogtreecommitdiff
path: root/scumm/actor.cpp
diff options
context:
space:
mode:
authorMax Horn2002-12-25 12:01:04 +0000
committerMax Horn2002-12-25 12:01:04 +0000
commitfef84f3737aac212881f5506da35f0f4e49bd2d1 (patch)
treeb3cbe67fe07938e1dc6446bbad80bf79abe8e440 /scumm/actor.cpp
parent65ee9da7436edca39504a94775e5fe4a68a3b4cc (diff)
downloadscummvm-rg350-fef84f3737aac212881f5506da35f0f4e49bd2d1.tar.gz
scummvm-rg350-fef84f3737aac212881f5506da35f0f4e49bd2d1.tar.bz2
scummvm-rg350-fef84f3737aac212881f5506da35f0f4e49bd2d1.zip
renamed Scumm::charset -> Scumm::_charset
svn-id: r6119
Diffstat (limited to 'scumm/actor.cpp')
-rw-r--r--scumm/actor.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/scumm/actor.cpp b/scumm/actor.cpp
index 529a688f43..54f5e0f613 100644
--- a/scumm/actor.cpp
+++ b/scumm/actor.cpp
@@ -1095,9 +1095,9 @@ void Scumm::actorTalk()
int oldact;
Actor *a;
- _msgPtrToAdd = charset._buffer;
+ _msgPtrToAdd = _charset._buffer;
_messagePtr = addMessageToStack(_messagePtr);
- assert((int)(_msgPtrToAdd - charset._buffer) < (int)(sizeof(charset._buffer)));
+ assert((int)(_msgPtrToAdd - _charset._buffer) < (int)(sizeof(_charset._buffer)));
if (_actorToPrintStrFor == 0xFF) {
if (!_keepText)
@@ -1128,7 +1128,7 @@ void Scumm::actorTalk()
a = derefActorSafe(_vars[VAR_TALK_ACTOR], "actorTalk(2)");
_charsetColor = a->talkColor;
}
- charset._bufPos = 0;
+ _charset._bufPos = 0;
_talkDelay = 0;
_haveMsg = 0xFF;
_vars[VAR_HAVE_MSG] = 0xFF;