From e075f0539568c5d14a61889a0233558376cdb5ce Mon Sep 17 00:00:00 2001
From: Arnaud Boutonné
Date: Tue, 17 Aug 2010 08:33:50 +0000
Subject: Gob - Clean up: suppress blanks and tabs present at the end of line

svn-id: r52136
---
 engines/gob/init_v3.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/gob/init_v3.cpp')

diff --git a/engines/gob/init_v3.cpp b/engines/gob/init_v3.cpp
index 4a2379bad0..cb4a0b713f 100644
--- a/engines/gob/init_v3.cpp
+++ b/engines/gob/init_v3.cpp
@@ -39,7 +39,7 @@ Init_v3::~Init_v3() {
 }
 
 void Init_v3::updateConfig() {
-// In the CD version of Goblins3, some texts are flagged 'subtitles' 
+// In the CD 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())
-- 
cgit v1.2.3


From b749b28c09cd2972e130b14260ee4925ef6bec72 Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Tue, 5 Oct 2010 18:54:30 +0000
Subject: GOB: Fix text display in Gob3 Windows/ADI

svn-id: r53032
---
 engines/gob/init_v3.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'engines/gob/init_v3.cpp')

diff --git a/engines/gob/init_v3.cpp b/engines/gob/init_v3.cpp
index cb4a0b713f..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;
 }
 
-- 
cgit v1.2.3