From e011df1f68c3acdeeba8e6d0982550a81fd0b5fe Mon Sep 17 00:00:00 2001
From: Arnaud Boutonné
Date: Sat, 6 Mar 2010 09:37:03 +0000
Subject: Gob3CD - Move subtitle check to initialization

svn-id: r48167
---
 engines/gob/draw_v2.cpp | 2 +-
 engines/gob/init_v2.cpp | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

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
-- 
cgit v1.2.3