From 381fc1fc44f3a5ddcd8f0187edb5a2e70a262bb7 Mon Sep 17 00:00:00 2001 From: D G Turner Date: Wed, 6 Nov 2024 19:32:01 +0000 Subject: [PATCH] SCUMM: Fix Duplicate Branches GCC Compiler Warning --- engines/scumm/scumm.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index d2eb46b710c..686bf689de6 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -369,6 +369,10 @@ ScummEngine::ScummEngine(OSystem *syst, const DetectorResult &dr) // Steam Win and Mac versions share the same DOS data files. bool isSteamVersion = Common::String(_game.preferredTag).equalsIgnoreCase("steam"); + // defaults + _screenWidth = 320; + _screenHeight = 200; + if (_game.platform == Common::kPlatformFMTowns && _game.version == 3) { // FM-TOWNS V3 games originally use 320x240, and we have an option to trim to 200 _screenWidth = 320; if (ConfMan.getBool("trim_fmtowns_to_200_pixels")) @@ -386,9 +390,6 @@ ScummEngine::ScummEngine(OSystem *syst, const DetectorResult &dr) } else if (!isSteamVersion && _useMacScreenCorrectHeight && _game.platform == Common::kPlatformMacintosh && _game.version >= 3) { _screenWidth = 320; _screenHeight = 200; - } else { - _screenWidth = 320; - _screenHeight = 200; } #ifndef DISABLE_TOWNS_DUAL_LAYER_MODE