aboutsummaryrefslogtreecommitdiff
path: root/scumm/actor.cpp
diff options
context:
space:
mode:
authorMax Horn2002-12-26 00:21:19 +0000
committerMax Horn2002-12-26 00:21:19 +0000
commit48c66ba21007dbbd086301d7555224ba28687778 (patch)
treeac49a16d3589b50a2b90eab59c01fd216094616a /scumm/actor.cpp
parent91fc86eede6e9e1ffc5f3f01e47b17bbbc2fb98d (diff)
downloadscummvm-rg350-48c66ba21007dbbd086301d7555224ba28687778.tar.gz
scummvm-rg350-48c66ba21007dbbd086301d7555224ba28687778.tar.bz2
scummvm-rg350-48c66ba21007dbbd086301d7555224ba28687778.zip
fixed save/load; more restructuring of the charset rendering code
svn-id: r6154
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 0422f11b73..d78536cc6c 100644
--- a/scumm/actor.cpp
+++ b/scumm/actor.cpp
@@ -1096,9 +1096,9 @@ void Scumm::actorTalk()
int oldact;
Actor *a;
- _msgPtrToAdd = _charset->_buffer;
+ _msgPtrToAdd = _charsetBuffer;
_messagePtr = addMessageToStack(_messagePtr);
- assert((int)(_msgPtrToAdd - _charset->_buffer) < (int)(sizeof(_charset->_buffer)));
+ assert((int)(_msgPtrToAdd - _charsetBuffer) < (int)(sizeof(_charsetBuffer)));
if (_actorToPrintStrFor == 0xFF) {
if (!_keepText)
@@ -1129,7 +1129,7 @@ void Scumm::actorTalk()
a = derefActorSafe(_vars[VAR_TALK_ACTOR], "actorTalk(2)");
_charsetColor = a->talkColor;
}
- _charset->_bufPos = 0;
+ _charsetBufPos = 0;
_talkDelay = 0;
_haveMsg = 0xFF;
_vars[VAR_HAVE_MSG] = 0xFF;