diff --git a/stella/src/emucore/OSystem.cxx b/stella/src/emucore/OSystem.cxx index 6f42f9bd8..6329ae31e 100644 --- a/stella/src/emucore/OSystem.cxx +++ b/stella/src/emucore/OSystem.cxx @@ -13,7 +13,7 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: OSystem.cxx,v 1.115 2008-02-06 13:45:22 stephena Exp $ +// $Id: OSystem.cxx,v 1.116 2008-03-03 14:53:34 stephena Exp $ //============================================================================ #include @@ -631,6 +631,8 @@ bool OSystem::queryConsoleInfo(const uInt8* image, uInt32 size, string s; myPropSet->getMD5(md5, props); + s = mySettings->getString("bs"); + if(s != "") props.set(Cartridge_Type, s); s = mySettings->getString("type"); if(s != "") props.set(Cartridge_Type, s); s = mySettings->getString("channels"); diff --git a/stella/src/emucore/Settings.cxx b/stella/src/emucore/Settings.cxx index de1969fa3..da9c81792 100644 --- a/stella/src/emucore/Settings.cxx +++ b/stella/src/emucore/Settings.cxx @@ -13,7 +13,7 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: Settings.cxx,v 1.131 2008-03-02 20:48:51 stephena Exp $ +// $Id: Settings.cxx,v 1.132 2008-03-03 14:53:34 stephena Exp $ //============================================================================ #include @@ -343,7 +343,8 @@ void Settings::usage() << " -holdselect Start the emulator with the Game Select switch held down\n" << " -holdbutton0 Start the emulator with the left joystick button held down\n" << endl - << " -type Sets the 'Cartridge.Type' property\n" + << " -bs Sets the 'Cartridge.Type' (bankswitch) property\n" + << " -type Same as using -bs\n" << " -channels Sets the 'Cartridge.Sound' property\n" << " -ld Sets the 'Console.LeftDifficulty' property\n" << " -rd Sets the 'Console.RightDifficulty' property\n"