diff options
| author | Paul Gilbert | 2016-07-26 19:48:14 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-07-26 19:48:14 -0400 |
| commit | 504cf6ecb688a3f1c65a857bffd527d8b0e6ba63 (patch) | |
| tree | 0c0d96d4061c11850c851f0fc981c75a58c20515 /engines/mads/messages.cpp | |
| parent | d8c28d15ae553d047b7e571f98727fa79ee143f3 (diff) | |
| parent | e19922d181e775791f9105b8be7ff410770ede51 (diff) | |
| download | scummvm-rg350-504cf6ecb688a3f1c65a857bffd527d8b0e6ba63.tar.gz scummvm-rg350-504cf6ecb688a3f1c65a857bffd527d8b0e6ba63.tar.bz2 scummvm-rg350-504cf6ecb688a3f1c65a857bffd527d8b0e6ba63.zip | |
Merge branch 'master' into xeen
Diffstat (limited to 'engines/mads/messages.cpp')
| -rw-r--r-- | engines/mads/messages.cpp | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/engines/mads/messages.cpp b/engines/mads/messages.cpp index d88806150d..773ebd309c 100644 --- a/engines/mads/messages.cpp +++ b/engines/mads/messages.cpp @@ -193,6 +193,10 @@ void KernelMessages::processText(int msgIndex) { msg._timeout = 0; } + if (msg._flags & KMSG_ANIM) { + warning("TODO: Implement animated text"); + } + if ((msg._timeout <= 0) && (_vm->_game->_trigger == 0)) { msg._flags |= KMSG_EXPIRE; if (msg._trigger != 0) { @@ -465,6 +469,16 @@ void KernelMessages::initRandomMessages(int maxSimultaneousMessages, va_end(va); } +void KernelMessages::setAnim(int msgId, int seqId, int val3 = 0) { + if (msgId < 0) + return; + + _entries[msgId]._flags |= KMSG_ANIM; + _entries[msgId]._sequenceIndex = seqId; + + warning("TODO: KernelMessages::setAnim, unused parameter"); +} + /*------------------------------------------------------------------------*/ @@ -544,7 +558,7 @@ void TextDisplayList::setDirtyAreas2() { } } -void TextDisplayList::draw(MSurface *s) { +void TextDisplayList::draw(BaseSurface *s) { for (uint idx = 0; idx < size(); ++idx) { TextDisplay &td = (*this)[idx]; if (td._active && (td._expire >= 0)) { |