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

Streamlined output for 'rominfo' command. 

Fixed bug in FileSnap Dialog where the reload was shown in emulation mode.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1272 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2007-01-07 01:26:52 +00:00
parent 227c357ece
commit c5bab0e56a
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
stella/src/emucore/Cart.cxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of // See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // 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 <cassert> #include <cassert>
@ -68,20 +68,21 @@ Cartridge* Cartridge::create(const uInt8* image, uInt32 size,
// Collect some info about the ROM // Collect some info about the ROM
ostringstream buf; ostringstream buf;
buf << " Size of ROM: " << size << endl buf << " ROM Size: " << size << endl
<< " Specified bankswitch type: " << type << endl; << " Bankswitch Type: " << type;
// See if we should try to auto-detect the cartridge type // See if we should try to auto-detect the cartridge type
// If we ask for extended info, always do an autodetect // If we ask for extended info, always do an autodetect
if(type == "AUTO-DETECT" || settings.getBool("rominfo")) if(type == "AUTO-DETECT" || settings.getBool("rominfo"))
{ {
string detected = autodetectType(image, size); string detected = autodetectType(image, size);
buf << " Auto-detected bankswitch type: " << detected << endl; buf << " ==> " << detected;
if(type != "AUTO-DETECT" && type != detected) if(type != "AUTO-DETECT" && type != detected)
buf << " ==> Bankswitch auto-detection not consistent" << endl; buf << " (auto-detection not consistent)";
type = detected; type = detected;
} }
buf << endl;
myAboutString = buf.str(); myAboutString = buf.str();
// We should know the cart's type by now so let's create it // We should know the cart's type by now so let's create it

8
stella/src/emucore/Console.cxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of // See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // 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 <cassert> #include <cassert>
@ -191,7 +191,7 @@ Console::Console(OSystem* osystem, Cartridge* cart, const Properties& props)
// Auto-detect NTSC/PAL mode if it's requested // Auto-detect NTSC/PAL mode if it's requested
myDisplayFormat = myProperties.get(Display_Format); myDisplayFormat = myProperties.get(Display_Format);
buf << " Specified display format: " << myDisplayFormat << endl; buf << " Display Format: " << myDisplayFormat;
if(myDisplayFormat == "AUTO-DETECT" || if(myDisplayFormat == "AUTO-DETECT" ||
myOSystem->settings().getBool("rominfo")) myOSystem->settings().getBool("rominfo"))
{ {
@ -211,9 +211,9 @@ Console::Console(OSystem* osystem, Cartridge* cart, const Properties& props)
myDisplayFormat = (palCount >= 15) ? "PAL" : "NTSC"; myDisplayFormat = (palCount >= 15) ? "PAL" : "NTSC";
if(myProperties.get(Display_Format) == "AUTO-DETECT") 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 // Make sure height is set properly for PAL ROM
if(myDisplayFormat.compare(0, 3, "PAL") == 0) if(myDisplayFormat.compare(0, 3, "PAL") == 0)

4
stella/src/gui/FileSnapDialog.cxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of // See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // 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 // Based on code from ScummVM - Scumm Interpreter
// Copyright (C) 2002-2004 The ScummVM project // Copyright (C) 2002-2004 The ScummVM project
@ -164,7 +164,7 @@ void FileSnapDialog::loadConfig()
b = instance()->settings().getBool("rombrowse"); b = instance()->settings().getBool("rombrowse");
myBrowseCheckbox->setState(b); myBrowseCheckbox->setState(b);
myReloadButton->setEnabled(!b); myReloadButton->setEnabled(myIsGlobal && !b);
s = instance()->settings().getString("ssdir"); s = instance()->settings().getString("ssdir");
mySnapPath->setLabel(s); mySnapPath->setLabel(s);