From f101906bc2d654c80ccadbf560261727759eea0c Mon Sep 17 00:00:00 2001
From: Thanasis Antoniou
Date: Mon, 2 Jul 2018 10:45:17 +0300
Subject: BLADERUNNER: Removed compile time macros, added synch with GUI

---
 engines/bladerunner/outtake.cpp | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

(limited to 'engines/bladerunner/outtake.cpp')

diff --git a/engines/bladerunner/outtake.cpp b/engines/bladerunner/outtake.cpp
index d52646b488..2a4da8f874 100644
--- a/engines/bladerunner/outtake.cpp
+++ b/engines/bladerunner/outtake.cpp
@@ -23,9 +23,7 @@
 #include "bladerunner/outtake.h"
 
 #include "bladerunner/bladerunner.h"
-#if SUBTITLES_SUPPORT
 #include "bladerunner/subtitles.h"
-#endif // SUBTITLES_SUPPORT
 #include "bladerunner/vqa_player.h"
 
 #include "common/debug.h"
@@ -46,12 +44,8 @@ void OuttakePlayer::play(const Common::String &name, bool noLocalization, int co
 	}
 
 	resName = resName + ".VQA";
-	
-#if SUBTITLES_SUPPORT
-    VQAPlayer vqa_player(_vm, &_vm->_surfaceBack); // fix for subtitles rendering properly
-#else
-	VQAPlayer vqa_player(_vm, &_vm->_surfaceFront); // original
-#endif // SUBTITLES_SUPPORT
+
+	VQAPlayer vqa_player(_vm, &_vm->_surfaceBack); // surfaceBack is needed here for subtitles rendering properly, original was _surfaceFront here
 
 	vqa_player.open();
 
@@ -63,17 +57,13 @@ void OuttakePlayer::play(const Common::String &name, bool noLocalization, int co
 				return;
 
 		int frame = vqa_player.update();
-		#if SUBTITLES_SUPPORT
-        blit(_vm->_surfaceBack, _vm->_surfaceFront); // new tha hack - helps to make subtitles disappear if the proper video is rendered in surface back and then pushed to the front surface
-        #endif // SUBTITLES_SUPPORT
+		blit(_vm->_surfaceBack, _vm->_surfaceFront); // This helps to make subtitles disappear properly, if the video is rendered in surface back and then pushed to the front surface
 		if (frame == -3)
 			break;
 
 		if (frame >= 0) {
-			#if SUBTITLES_SUPPORT
-            _vm->_subtitles->getOuttakeSubsText(resName + ".TRE" , frame);
+			_vm->_subtitles->getOuttakeSubsText(resName + ".TRE" , frame);
 			_vm->_subtitles->tickOuttakes(_vm->_surfaceFront);
-			#endif // SUBTITLES_SUPPORT
 			_vm->blitToScreen(_vm->_surfaceFront);
 		}
 
-- 
cgit v1.2.3