From af78f4dfae1995c60e2743d702288559174d4230 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Sat, 6 Sep 2003 01:20:15 +0000
Subject: Don't let Amiga and Platform options cancel each other out for Amiga
 support.

svn-id: r10029
---
 scumm/scummvm.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'scumm')

diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp
index d6efb51679..3c8772ae05 100644
--- a/scumm/scummvm.cpp
+++ b/scumm/scummvm.cpp
@@ -237,7 +237,8 @@ Engine *Engine_SCUMM_create(GameDetector *detector, OSystem *syst) {
 
 	switch (detector->_platform) {
 	case 1:
-		detector->_game.features |= GF_AMIGA;
+		if (!(_features & GF_AMIGA))
+			detector->_game.features |= GF_AMIGA;
 		break;
 	case 2:
 		detector->_game.features |= GF_ATARI_ST;
-- 
cgit v1.2.3