diff options
| author | Johannes Schickel | 2010-10-13 03:57:44 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-10-13 03:57:44 +0000 |
| commit | 75e8452b6e6a2bf4fb2f588aa00b428a60d873b5 (patch) | |
| tree | f29541d55309487a94bd1d38e8b53bb3dde9aec6 /engines/gob/init_v3.cpp | |
| parent | 48ee83b88957dab86bc763e9ef21a70179fa8679 (diff) | |
| parent | e9f50882ea5b6beeefa994040be9d3bab6a1f107 (diff) | |
| download | scummvm-rg350-75e8452b6e6a2bf4fb2f588aa00b428a60d873b5.tar.gz scummvm-rg350-75e8452b6e6a2bf4fb2f588aa00b428a60d873b5.tar.bz2 scummvm-rg350-75e8452b6e6a2bf4fb2f588aa00b428a60d873b5.zip | |
OPENGL: Merged from trunk, from rev 52105 to 53396.
This includes an rather hacky attempt to merge all the recent gp2x backend
changes into the branch. I suppose the gp2x backend and probably all new
backends, i.e. gph, dingux etc., might not compile anymore.
Since I have no way of testing those it would be nice if porters could look
into getting those up to speed in this branch.
svn-id: r53399
Diffstat (limited to 'engines/gob/init_v3.cpp')
| -rw-r--r-- | engines/gob/init_v3.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/engines/gob/init_v3.cpp b/engines/gob/init_v3.cpp index 4a2379bad0..b3816c10e9 100644 --- a/engines/gob/init_v3.cpp +++ b/engines/gob/init_v3.cpp @@ -39,10 +39,11 @@ Init_v3::~Init_v3() { } void Init_v3::updateConfig() { -// In the CD version of Goblins3, some texts are flagged 'subtitles' -// incorrectly and therefore should be displayed in all cases. +// In the CD and Windows version of Goblins3, some texts are flagged +// 'subtitles' incorrectly and therefore should be displayed in all cases. // The first obvious example is just after Death level. - if ((_vm->getGameType() == kGameTypeGob3) && _vm->isCD()) + if ((_vm->getGameType() == kGameTypeGob3) && + (_vm->isCD() || (_vm->getPlatform() == Common::kPlatformWindows))) _vm->_global->_doSubtitles = true; } |