ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

When the new TIA core is enabled in a build, set it to the default when no 

defaults have been specified.  The reason being, testers will be running old
and new versions of Stella, and with the previous settings, they would have
to continually reset 'tia.core' every time they run a new build.  Besides,
the point is for the new core to be the default, so we may as well enforce that
in the code.
This commit is contained in:
Stephen Anthony 2016-12-02 10:43:46 -03:30
parent 7bfaf10e80
commit 9ca6f89778
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/emucore/Console.cxx
View File

@ -545,10 +545,10 @@ void Console::changeHeight(int direction)
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
AbstractTIA* Console::createTIA() AbstractTIA* Console::createTIA()
{ {
string coreType = "default";
#ifdef SUPPORT_6502TS_TIA #ifdef SUPPORT_6502TS_TIA
coreType = myOSystem.settings().getString("tia.core"); string coreType = myOSystem.settings().getString("tia.core");
#else
string coreType = "default";
#endif #endif
if (coreType == "default") { if (coreType == "default") {

4
src/emucore/Settings.cxx
View File

@ -49,7 +49,7 @@ Settings::Settings(OSystem& osystem)
// TIA specific options // TIA specific options
#ifdef SUPPORT_6502TS_TIA #ifdef SUPPORT_6502TS_TIA
setInternal("tia.core", "default"); setInternal("tia.core", "6502ts");
#endif #endif
setInternal("tia.zoom", "2"); setInternal("tia.zoom", "2");
setInternal("tia.inter", "false"); setInternal("tia.inter", "false");
@ -330,7 +330,7 @@ void Settings::validate()
#ifdef SUPPORT_6502TS_TIA #ifdef SUPPORT_6502TS_TIA
s = getString("tia.core"); s = getString("tia.core");
if (s != "6502ts" && s != "default") setInternal("tia.core", "default"); if (s != "6502ts" && s != "default") setInternal("tia.core", "6502ts");
#endif #endif
} }