[Scummvm-cvs-logs] SF.net SVN: scummvm:[48167] scummvm/trunk/engines/gob

[strangerke at users.sourceforge.net]

Revision: 48167
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48167&view=rev
Author:   strangerke
Date:     2010-03-06 09:37:03 +0000 (Sat, 06 Mar 2010)

Log Message:
-----------
Gob3CD - Move subtitle check to initialization

Modified Paths:
--------------
    scummvm/trunk/engines/gob/draw_v2.cpp
    scummvm/trunk/engines/gob/init_v2.cpp

Modified: scummvm/trunk/engines/gob/draw_v2.cpp
===================================================================
--- scummvm/trunk/engines/gob/draw_v2.cpp	2010-03-06 00:35:27 UTC (rev 48166)
+++ scummvm/trunk/engines/gob/draw_v2.cpp	2010-03-06 09:37:03 UTC (rev 48167)
@@ -221,7 +221,7 @@
 
 	bool isSubtitle = (ptr[1] & 0x80) != 0;
 
-	if (isSubtitle && !_vm->_global->_doSubtitles && ((_vm->getGameType() != kGameTypeGob3) || !_vm->isCD())) {
+	if (isSubtitle && !_vm->_global->_doSubtitles) {
 		delete textItem;
 		return;
 	}

Modified: scummvm/trunk/engines/gob/init_v2.cpp
===================================================================
--- scummvm/trunk/engines/gob/init_v2.cpp	2010-03-06 00:35:27 UTC (rev 48166)
+++ scummvm/trunk/engines/gob/init_v2.cpp	2010-03-06 09:37:03 UTC (rev 48167)
@@ -68,6 +68,8 @@
 	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


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.