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

Fixed issue with 'tiadefaults' only setting defaults for width and height. 

It now uses the defaults for xstart and ystart as well.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1231 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2006-12-22 22:32:49 +00:00
parent 3a9ac632da
commit 1e0edb95e2
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
stella/src/emucore/PropsSet.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: PropsSet.cxx,v 1.27 2006-12-13 17:09:10 stephena Exp $ // $Id: PropsSet.cxx,v 1.28 2006-12-22 22:32:49 stephena Exp $
//============================================================================ //============================================================================
#include <sstream> #include <sstream>
@ -119,8 +119,10 @@ void PropertiesSet::getMD5(const string& md5, Properties& properties,
// Reset TIA positioning to defaults if option is enabled // Reset TIA positioning to defaults if option is enabled
if(myOSystem->settings().getBool("tiadefaults")) if(myOSystem->settings().getBool("tiadefaults"))
{ {
// properties.set(Display_XStart, Properties::ourDefaultProperties[Display_XStart]); #if !defined(GP2X) // Quick GP2X hack, it only wants defaults for width and height
// properties.set(Display_YStart, Properties::ourDefaultProperties[Display_YStart]); properties.set(Display_XStart, Properties::ourDefaultProperties[Display_XStart]);
properties.set(Display_YStart, Properties::ourDefaultProperties[Display_YStart]);
#endif
properties.set(Display_Width, Properties::ourDefaultProperties[Display_Width]); properties.set(Display_Width, Properties::ourDefaultProperties[Display_Width]);
properties.set(Display_Height, Properties::ourDefaultProperties[Display_Height]); properties.set(Display_Height, Properties::ourDefaultProperties[Display_Height]);
} }

6
stella/src/emucore/Settings.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: Settings.cxx,v 1.105 2006-12-20 12:42:55 stephena Exp $ // $Id: Settings.cxx,v 1.106 2006-12-22 22:32:49 stephena Exp $
//============================================================================ //============================================================================
#include <cassert> #include <cassert>
@ -75,12 +75,12 @@ Settings::Settings(OSystem* osystem)
setInternal("sssingle", "false"); setInternal("sssingle", "false");
setInternal("romdir", ""); setInternal("romdir", "");
setInternal("rombrowse", "false"); setInternal("rombrowse", "true");
setInternal("lastrom", ""); setInternal("lastrom", "");
setInternal("modtime", ""); setInternal("modtime", "");
setInternal("debugheight", "0"); setInternal("debugheight", "0");
setInternal("tiadefaults", "true"); setInternal("tiadefaults", "false");
setInternal("autoslot", "false"); setInternal("autoslot", "false");
setInternal("fastscbios", "true"); setInternal("fastscbios", "true");
} }

12
stella/src/gui/LauncherDialog.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: LauncherDialog.cxx,v 1.61 2006-12-09 04:02:40 stephena Exp $ // $Id: LauncherDialog.cxx,v 1.62 2006-12-22 22:32:49 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
@ -285,10 +285,7 @@ void LauncherDialog::loadDirListing()
// Add '[..]' to indicate previous folder // Add '[..]' to indicate previous folder
if(myCurrentNode.hasParent()) if(myCurrentNode.hasParent())
{ myGameList->appendGame(" [..]", "", "", true);
const string& parent = myCurrentNode.getParent().path();
myGameList->appendGame(" [..]", parent, "", true);
}
// Now add the directory entries // Now add the directory entries
for(unsigned int idx = 0; idx < files.size(); idx++) for(unsigned int idx = 0; idx < files.size(); idx++)
@ -440,7 +437,10 @@ void LauncherDialog::handleCommand(CommandSender* sender, int cmd,
// Directory's should be selected (ie, enter them and redisplay) // Directory's should be selected (ie, enter them and redisplay)
if(myBrowseModeFlag && myGameList->isDir(item)) if(myBrowseModeFlag && myGameList->isDir(item))
{ {
myCurrentNode = entry; if(myGameList->name(item) == " [..]")
myCurrentNode = myCurrentNode.getParent();
else
myCurrentNode = entry;
updateListing(); updateListing();
} }
else if(instance()->createConsole(entry)) else if(instance()->createConsole(entry))