diff options
| author | Arnaud Boutonné | 2010-03-06 09:37:03 +0000 |
|---|---|---|
| committer | Arnaud Boutonné | 2010-03-06 09:37:03 +0000 |
| commit | e011df1f68c3acdeeba8e6d0982550a81fd0b5fe (patch) | |
| tree | 9742fe70a0344ad19317c7a4fd8d6cd33bf62122 | |
| parent | e869b5c7e67d26227a013d2d5596090165a3e180 (diff) | |
| download | scummvm-rg350-e011df1f68c3acdeeba8e6d0982550a81fd0b5fe.tar.gz scummvm-rg350-e011df1f68c3acdeeba8e6d0982550a81fd0b5fe.tar.bz2 scummvm-rg350-e011df1f68c3acdeeba8e6d0982550a81fd0b5fe.zip | |
Gob3CD - Move subtitle check to initialization
svn-id: r48167
| -rw-r--r-- | engines/gob/draw_v2.cpp | 2 | ||||
| -rw-r--r-- | engines/gob/init_v2.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/engines/gob/draw_v2.cpp b/engines/gob/draw_v2.cpp index 7efb414947..985f84aaef 100644 --- a/engines/gob/draw_v2.cpp +++ b/engines/gob/draw_v2.cpp @@ -221,7 +221,7 @@ void Draw_v2::printTotText(int16 id) { bool isSubtitle = (ptr[1] & 0x80) != 0; - if (isSubtitle && !_vm->_global->_doSubtitles && ((_vm->getGameType() != kGameTypeGob3) || !_vm->isCD())) { + if (isSubtitle && !_vm->_global->_doSubtitles) { delete textItem; return; } diff --git a/engines/gob/init_v2.cpp b/engines/gob/init_v2.cpp index f89d5a8cfb..a5287c8050 100644 --- a/engines/gob/init_v2.cpp +++ b/engines/gob/init_v2.cpp @@ -68,6 +68,8 @@ void Init_v2::initVideo() { if (_vm->_global->_videoMode != 0) _vm->_video->initSurfDesc(_vm->_global->_videoMode, _vm->_video->_surfWidth, _vm->_video->_surfHeight, PRIMARY_SURFACE); + if ((_vm->getGameType() == kGameTypeGob3) && _vm->isCD()) + _vm->_global->_doSubtitles = true; } } // End of namespace Gob |