Fix for probing CpuType from Apple2Type

This commit is contained in:
tomcw 2016-02-14 17:25:58 +00:00
parent 37ad1ebd63
commit 13e7a6cc65

View File

@ -165,16 +165,15 @@ void SetMainCpu(eCpuType cpu)
g_MainCPU = cpu; g_MainCPU = cpu;
} }
static bool IsCpu6502(eApple2Type apple2Type) static bool IsCpu65C02(eApple2Type apple2Type)
{ {
return IS_APPLE2 || // NB. All Pravets clones are 6502 (GH#307)
(apple2Type == A2TYPE_APPLE2E) || return (apple2Type == A2TYPE_APPLE2EENHANCED) || (apple2Type & A2TYPE_APPLE2C);
IS_CLONE(); // NB. All Pravets clones are 6502 (GH#307)
} }
eCpuType ProbeMainCpuDefault(eApple2Type apple2Type) eCpuType ProbeMainCpuDefault(eApple2Type apple2Type)
{ {
return IsCpu6502(apple2Type) ? CPU_6502 : CPU_65C02; return IsCpu65C02(apple2Type) ? CPU_65C02 : CPU_6502;
} }
void SetMainCpuDefault(eApple2Type apple2Type) void SetMainCpuDefault(eApple2Type apple2Type)