diff options
| author | Max Horn | 2002-12-25 21:04:47 +0000 |
|---|---|---|
| committer | Max Horn | 2002-12-25 21:04:47 +0000 |
| commit | fca9ec09e7709ff4400d2a9a7fd76f4f21781006 (patch) | |
| tree | 2c9dd18841983469c4780c75d90762f8a167c048 /scumm/actor.cpp | |
| parent | f1808d20ac90f4212fd14aeaf544a8aaac6a3fbc (diff) | |
| download | scummvm-rg350-fca9ec09e7709ff4400d2a9a7fd76f4f21781006.tar.gz scummvm-rg350-fca9ec09e7709ff4400d2a9a7fd76f4f21781006.tar.bz2 scummvm-rg350-fca9ec09e7709ff4400d2a9a7fd76f4f21781006.zip | |
moved CharsetRendere into its own header/source file; changed Scumm::_charset into a pointer, to make it possible to use different implementations of it
svn-id: r6147
Diffstat (limited to 'scumm/actor.cpp')
| -rw-r--r-- | scumm/actor.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/scumm/actor.cpp b/scumm/actor.cpp index 54f5e0f613..0422f11b73 100644 --- a/scumm/actor.cpp +++ b/scumm/actor.cpp @@ -24,6 +24,7 @@ #include "scumm.h" #include "actor.h" #include "akos.h" +#include "charset.h" #include "costume.h" #include "resource.h" #include "scumm/sound.h" @@ -1095,9 +1096,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 +1129,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; |