From 13e7a6cc655014adbff7eab6f2f5a5f362194e84 Mon Sep 17 00:00:00 2001 From: tomcw Date: Sun, 14 Feb 2016 17:25:58 +0000 Subject: [PATCH] Fix for probing CpuType from Apple2Type --- source/CPU.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/source/CPU.cpp b/source/CPU.cpp index e12e28a3..e0ecf3a4 100644 --- a/source/CPU.cpp +++ b/source/CPU.cpp @@ -165,16 +165,15 @@ void SetMainCpu(eCpuType cpu) g_MainCPU = cpu; } -static bool IsCpu6502(eApple2Type apple2Type) +static bool IsCpu65C02(eApple2Type apple2Type) { - return IS_APPLE2 || - (apple2Type == A2TYPE_APPLE2E) || - IS_CLONE(); // NB. All Pravets clones are 6502 (GH#307) + // NB. All Pravets clones are 6502 (GH#307) + return (apple2Type == A2TYPE_APPLE2EENHANCED) || (apple2Type & A2TYPE_APPLE2C); } eCpuType ProbeMainCpuDefault(eApple2Type apple2Type) { - return IsCpu6502(apple2Type) ? CPU_6502 : CPU_65C02; + return IsCpu65C02(apple2Type) ? CPU_65C02 : CPU_6502; } void SetMainCpuDefault(eApple2Type apple2Type)