diff --git a/stella/src/emucore/Cart.cxx b/stella/src/emucore/Cart.cxx index f44966185..f09333d85 100644 --- a/stella/src/emucore/Cart.cxx +++ b/stella/src/emucore/Cart.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: Cart.cxx,v 1.29 2007-01-03 17:37:46 stephena Exp $ +// $Id: Cart.cxx,v 1.30 2007-01-07 01:26:52 stephena Exp $ //============================================================================ #include @@ -68,20 +68,21 @@ Cartridge* Cartridge::create(const uInt8* image, uInt32 size, // Collect some info about the ROM ostringstream buf; - buf << " Size of ROM: " << size << endl - << " Specified bankswitch type: " << type << endl; + buf << " ROM Size: " << size << endl + << " Bankswitch Type: " << type; // See if we should try to auto-detect the cartridge type // If we ask for extended info, always do an autodetect if(type == "AUTO-DETECT" || settings.getBool("rominfo")) { string detected = autodetectType(image, size); - buf << " Auto-detected bankswitch type: " << detected << endl; + buf << " ==> " << detected; if(type != "AUTO-DETECT" && type != detected) - buf << " ==> Bankswitch auto-detection not consistent" << endl; + buf << " (auto-detection not consistent)"; type = detected; } + buf << endl; myAboutString = buf.str(); // We should know the cart's type by now so let's create it diff --git a/stella/src/emucore/Console.cxx b/stella/src/emucore/Console.cxx index 3387c404e..1d38f3a3d 100644 --- a/stella/src/emucore/Console.cxx +++ b/stella/src/emucore/Console.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: Console.cxx,v 1.121 2007-01-06 21:13:29 stephena Exp $ +// $Id: Console.cxx,v 1.122 2007-01-07 01:26:52 stephena Exp $ //============================================================================ #include @@ -191,7 +191,7 @@ Console::Console(OSystem* osystem, Cartridge* cart, const Properties& props) // Auto-detect NTSC/PAL mode if it's requested myDisplayFormat = myProperties.get(Display_Format); - buf << " Specified display format: " << myDisplayFormat << endl; + buf << " Display Format: " << myDisplayFormat; if(myDisplayFormat == "AUTO-DETECT" || myOSystem->settings().getBool("rominfo")) { @@ -211,9 +211,9 @@ Console::Console(OSystem* osystem, Cartridge* cart, const Properties& props) myDisplayFormat = (palCount >= 15) ? "PAL" : "NTSC"; if(myProperties.get(Display_Format) == "AUTO-DETECT") - buf << " Auto-detected display format: " << myDisplayFormat << endl; + buf << " ==> " << myDisplayFormat; } - buf << cart->about(); + buf << endl << cart->about(); // Make sure height is set properly for PAL ROM if(myDisplayFormat.compare(0, 3, "PAL") == 0) diff --git a/stella/src/gui/FileSnapDialog.cxx b/stella/src/gui/FileSnapDialog.cxx index 43b45d9c8..389543998 100644 --- a/stella/src/gui/FileSnapDialog.cxx +++ b/stella/src/gui/FileSnapDialog.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: FileSnapDialog.cxx,v 1.2 2007-01-01 18:04:52 stephena Exp $ +// $Id: FileSnapDialog.cxx,v 1.3 2007-01-07 01:26:52 stephena Exp $ // // Based on code from ScummVM - Scumm Interpreter // Copyright (C) 2002-2004 The ScummVM project @@ -164,7 +164,7 @@ void FileSnapDialog::loadConfig() b = instance()->settings().getBool("rombrowse"); myBrowseCheckbox->setState(b); - myReloadButton->setEnabled(!b); + myReloadButton->setEnabled(myIsGlobal && !b); s = instance()->settings().getString("ssdir"); mySnapPath->setLabel(s);