Merge branch 'tildearrow:master' into master
This commit is contained in:
commit
c23c7ced3d
|
@ -1167,9 +1167,6 @@ void DivEngine::convertOldFlags(unsigned int oldFlags, DivConfig& newFlags, DivS
|
||||||
case 14:
|
case 14:
|
||||||
if (sys==DIV_SYSTEM_AY8910) newFlags.set("clockSel",14);
|
if (sys==DIV_SYSTEM_AY8910) newFlags.set("clockSel",14);
|
||||||
break;
|
break;
|
||||||
case 15:
|
|
||||||
if (sys==DIV_SYSTEM_AY8910) newFlags.set("clockSel",15);
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
if (sys==DIV_SYSTEM_AY8910) switch ((oldFlags>>4)&3) {
|
if (sys==DIV_SYSTEM_AY8910) switch ((oldFlags>>4)&3) {
|
||||||
case 0:
|
case 0:
|
||||||
|
|
Loading…
Reference in New Issue