diff options
author | Travis Howell | 2007-05-22 11:31:31 +0000 |
---|---|---|
committer | Travis Howell | 2007-05-22 11:31:31 +0000 |
commit | 766d889b691fa6b13f90d6bc1eb607a7b3d3eaea (patch) | |
tree | 1824bbf068479a8a14e1bba7039ceeaf719a0a8b /engines | |
parent | ca0a75a9d0f205c93b0510218a7713ea997dccc0 (diff) | |
download | scummvm-rg350-766d889b691fa6b13f90d6bc1eb607a7b3d3eaea.tar.gz scummvm-rg350-766d889b691fa6b13f90d6bc1eb607a7b3d3eaea.tar.bz2 scummvm-rg350-766d889b691fa6b13f90d6bc1eb607a7b3d3eaea.zip |
Move code to correct position.
svn-id: r26912
Diffstat (limited to 'engines')
-rw-r--r-- | engines/agos/charset.cpp | 6 | ||||
-rw-r--r-- | engines/agos/window.cpp | 9 |
2 files changed, 8 insertions, 7 deletions
diff --git a/engines/agos/charset.cpp b/engines/agos/charset.cpp index 2d37d33aa5..2dbf8277af 100644 --- a/engines/agos/charset.cpp +++ b/engines/agos/charset.cpp @@ -602,12 +602,6 @@ void AGOSEngine::openTextWindow() { void AGOSEngine::windowPutChar(WindowBlock *window, byte c, byte b) { byte width = 6; - if (getGameType() == GType_ELVIRA1 || getGameType() == GType_ELVIRA2 || getGameType() == GType_WW) { - if (!(window->flags & 1)) { - haltAnimation(); - } - } - if (c == 12) { clearWindow(window); } else if (c == 13 || c == 10) { diff --git a/engines/agos/window.cpp b/engines/agos/window.cpp index 80f4d588ef..14bd6afe09 100644 --- a/engines/agos/window.cpp +++ b/engines/agos/window.cpp @@ -214,8 +214,15 @@ void AGOSEngine::setTextColor(uint color) { } void AGOSEngine::windowPutChar(uint a) { - if (_textWindow != _windowArray[0]) + if (_textWindow != _windowArray[0]) { + if (getGameType() == GType_ELVIRA1 || getGameType() == GType_ELVIRA2 || getGameType() == GType_WW) { + if (!(_textWindow->flags & 1)) { + haltAnimation(); + } + } + windowPutChar(_textWindow, a); + } } void AGOSEngine::waitWindow(WindowBlock *window) { |