[Scummvm-git-logs] scummvm branch-2-1 -> 9897581e55d876b7fd880141f590b9d123c1d41c

[lotharsm]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
9897581e55 BLADERUNNER: Fix compilation issue


Commit: 9897581e55d876b7fd880141f590b9d123c1d41c
    https://github.com/scummvm/scummvm/commit/9897581e55d876b7fd880141f590b9d123c1d41c
Author: Lothar Serra Mari (serra at scummvm.org)
Date: 2019-09-30T01:54:54+02:00

Commit Message:
BLADERUNNER: Fix compilation issue

Sadly, I introduced several errors while cherry-picking from the master
branch. Please apologize the trouble.

Changed paths:
    engines/bladerunner/detection_tables.h


diff --git a/engines/bladerunner/detection_tables.h b/engines/bladerunner/detection_tables.h
index 9b00ebc..869839f 100644
--- a/engines/bladerunner/detection_tables.h
+++ b/engines/bladerunner/detection_tables.h
@@ -39,13 +39,8 @@ static const ADGameDescription gameDescriptions[] = {
 		AD_ENTRY1s("STARTUP.MIX", "5643b53306ca7764cf1ec7b79c9630a3", 2312374),
 		Common::EN_ANY,
 		Common::kPlatformWindows,
-<<<<<<< HEAD
-		ADGF_TESTING,
-		GUIO3(GAMEOPTION_SITCOM, GAMEOPTION_SHORTY, GAMEOPTION_FRAMELIMITER_NODELAYMILLIS)
-=======
 		ADGF_NO_FLAGS,
 		GUIO4(GAMEOPTION_SITCOM, GAMEOPTION_SHORTY, GAMEOPTION_FRAMELIMITER_NODELAYMILLIS, GUIO_NOMIDI)
->>>>>>> e2b9112c2c... BLADERUNNER: Remove ADGF_TESTING flag
 	},
 
 	// BladeRunner (German)
@@ -55,13 +50,8 @@ static const ADGameDescription gameDescriptions[] = {
 		AD_ENTRY1s("STARTUP.MIX", "57d674ed860148a530b7f4957cbe65ec", 2314301),
 		Common::DE_DEU,
 		Common::kPlatformWindows,
-<<<<<<< HEAD
-		ADGF_TESTING,
-		GUIO3(GAMEOPTION_SITCOM, GAMEOPTION_SHORTY, GAMEOPTION_FRAMELIMITER_NODELAYMILLIS)
-=======
 		ADGF_NO_FLAGS,
 		GUIO4(GAMEOPTION_SITCOM, GAMEOPTION_SHORTY, GAMEOPTION_FRAMELIMITER_NODELAYMILLIS, GUIO_NOMIDI)
->>>>>>> e2b9112c2c... BLADERUNNER: Remove ADGF_TESTING flag
 	},
 
 	// BladeRunner (French) - Bug #9722
@@ -71,13 +61,8 @@ static const ADGameDescription gameDescriptions[] = {
 		AD_ENTRY1s("STARTUP.MIX", "39d1901df50935d58aee252707134952", 2314526),
 		Common::FR_FRA,
 		Common::kPlatformWindows,
-<<<<<<< HEAD
-		ADGF_TESTING,
-		GUIO3(GAMEOPTION_SITCOM, GAMEOPTION_SHORTY, GAMEOPTION_FRAMELIMITER_NODELAYMILLIS)
-=======
 		ADGF_NO_FLAGS,
 		GUIO4(GAMEOPTION_SITCOM, GAMEOPTION_SHORTY, GAMEOPTION_FRAMELIMITER_NODELAYMILLIS, GUIO_NOMIDI)
->>>>>>> e2b9112c2c... BLADERUNNER: Remove ADGF_TESTING flag
 	},
 
 	// BladeRunner (Italian)
@@ -87,13 +72,8 @@ static const ADGameDescription gameDescriptions[] = {
 		AD_ENTRY1s("STARTUP.MIX", "c7ceb9c691223d25e78516aa519ff504", 2314461),
 		Common::IT_ITA,
 		Common::kPlatformWindows,
-<<<<<<< HEAD
-		ADGF_TESTING,
-		GUIO3(GAMEOPTION_SITCOM, GAMEOPTION_SHORTY, GAMEOPTION_FRAMELIMITER_NODELAYMILLIS)
-=======
 		ADGF_NO_FLAGS,
 		GUIO4(GAMEOPTION_SITCOM, GAMEOPTION_SHORTY, GAMEOPTION_FRAMELIMITER_NODELAYMILLIS, GUIO_NOMIDI)
->>>>>>> e2b9112c2c... BLADERUNNER: Remove ADGF_TESTING flag
 	},
 
 	// BladeRunner (Russian - Fargus Multimedia + Home Systems, Inc.)
@@ -103,13 +83,8 @@ static const ADGameDescription gameDescriptions[] = {
 		AD_ENTRY1s("STARTUP.MIX", "bf42af841d9f4b643665013a348c81e0", 2483111),
 		Common::RU_RUS,
 		Common::kPlatformWindows,
-<<<<<<< HEAD
-		ADGF_TESTING,
-		GUIO3(GAMEOPTION_SITCOM, GAMEOPTION_SHORTY, GAMEOPTION_FRAMELIMITER_NODELAYMILLIS)
-=======
 		ADGF_NO_FLAGS,
 		GUIO4(GAMEOPTION_SITCOM, GAMEOPTION_SHORTY, GAMEOPTION_FRAMELIMITER_NODELAYMILLIS, GUIO_NOMIDI)
->>>>>>> e2b9112c2c... BLADERUNNER: Remove ADGF_TESTING flag
 	},
 
 	// BladeRunner (Russian - Fargus Multimedia + Home Systems, Inc. + Siberian Studio, R3)
@@ -119,13 +94,8 @@ static const ADGameDescription gameDescriptions[] = {
 		AD_ENTRY1s("STARTUP.MIX", "c198b54a5366b88b1734bbca21d3b192", 2678672),
 		Common::RU_RUS,
 		Common::kPlatformWindows,
-<<<<<<< HEAD
-		ADGF_TESTING,
-		GUIO3(GAMEOPTION_SITCOM, GAMEOPTION_SHORTY, GAMEOPTION_FRAMELIMITER_NODELAYMILLIS)
-=======
 		ADGF_NO_FLAGS,
 		GUIO4(GAMEOPTION_SITCOM, GAMEOPTION_SHORTY, GAMEOPTION_FRAMELIMITER_NODELAYMILLIS, GUIO_NOMIDI)
->>>>>>> e2b9112c2c... BLADERUNNER: Remove ADGF_TESTING flag
 	},
 
 	// BladeRunner (Russian - Fargus Multimedia + Home Systems, Inc. + Siberian Studio, R4)
@@ -135,13 +105,8 @@ static const ADGameDescription gameDescriptions[] = {
 		AD_ENTRY1s("STARTUP.MIX", "d62498a7415682bb3ff86a894303c836", 2810053),
 		Common::RU_RUS,
 		Common::kPlatformWindows,
-<<<<<<< HEAD
-		ADGF_TESTING,
-		GUIO3(GAMEOPTION_SITCOM, GAMEOPTION_SHORTY, GAMEOPTION_FRAMELIMITER_NODELAYMILLIS)
-=======
 		ADGF_NO_FLAGS,
 		GUIO4(GAMEOPTION_SITCOM, GAMEOPTION_SHORTY, GAMEOPTION_FRAMELIMITER_NODELAYMILLIS, GUIO_NOMIDI)
->>>>>>> e2b9112c2c... BLADERUNNER: Remove ADGF_TESTING flag
 	},
 
 	// BladeRunner (Spanish)
@@ -151,13 +116,8 @@ static const ADGameDescription gameDescriptions[] = {
 		AD_ENTRY1s("STARTUP.MIX", "54cad53da9e4ae03a85648834ac6765d", 2312976),
 		Common::ES_ESP,
 		Common::kPlatformWindows,
-<<<<<<< HEAD
-		ADGF_TESTING,
-		GUIO3(GAMEOPTION_SITCOM, GAMEOPTION_SHORTY, GAMEOPTION_FRAMELIMITER_NODELAYMILLIS)
-=======
 		ADGF_NO_FLAGS,
 		GUIO4(GAMEOPTION_SITCOM, GAMEOPTION_SHORTY, GAMEOPTION_FRAMELIMITER_NODELAYMILLIS, GUIO_NOMIDI)
->>>>>>> e2b9112c2c... BLADERUNNER: Remove ADGF_TESTING flag
 	},
 
 	// Versions with restored content