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

Fixed PAL autodetection regression. 

git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2571 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2012-12-17 22:04:20 +00:00
parent 0616691bc5
commit 2aca70e19e
3 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Changes.txt
View File

@ -14,6 +14,9 @@
3.7.4 to 3.8: (December xx, 2012) 3.7.4 to 3.8: (December xx, 2012)
* Improved regressions in PAL format autodetection, introduced in the
past several releases.
* Fixed crash when loading invalid PNG files in ROM browser. * Fixed crash when loading invalid PNG files in ROM browser.
* Snapshots generated by Stella now include more informative info, such * Snapshots generated by Stella now include more informative info, such

4
src/common/bspf.hxx
View File

@ -85,8 +85,8 @@ using namespace std;
// I wish Windows had a complete POSIX layer // I wish Windows had a complete POSIX layer
#if defined BSPF_WIN32 && !defined __GNUG__ #if defined BSPF_WIN32 && !defined __GNUG__
#define BSPF_strcasecmp stricmp #define BSPF_strcasecmp _stricmp
#define BSPF_strncasecmp strnicmp #define BSPF_strncasecmp _strnicmp
#define BSPF_isblank(c) ((c == ' ') || (c == '\t')) #define BSPF_isblank(c) ((c == ' ') || (c == '\t'))
#define BSPF_snprintf _snprintf #define BSPF_snprintf _snprintf
#define BSPF_vsnprintf _vsnprintf #define BSPF_vsnprintf _vsnprintf

17
src/emucore/Console.cxx
View File

@ -75,9 +75,9 @@ Console::Console(OSystem* osystem, Cartridge* cart, const Properties& props)
mySystem(0), mySystem(0),
myCart(cart), myCart(cart),
myCMHandler(0), myCMHandler(0),
myDisplayFormat("NTSC"), myDisplayFormat(""), // Unknown TV format @ start
myFramerate(60.0), myFramerate(0.0), // Unknown framerate @ start
myCurrentFormat(0), myCurrentFormat(0), // Unknown format @ start
myUserPaletteDefined(false) myUserPaletteDefined(false)
{ {
// Load user-defined palette for this ROM // Load user-defined palette for this ROM
@ -596,19 +596,14 @@ void Console::setTIAProperties()
// Make sure these values fit within the bounds of the desktop // Make sure these values fit within the bounds of the desktop
// If not, attempt to center vertically // If not, attempt to center vertically
if(height <= myOSystem->desktopHeight()) if(height > myOSystem->desktopHeight())
{
myTIA->setYStart(ystart);
myTIA->setHeight(height);
}
else
{ {
ystart += height - myOSystem->desktopHeight(); ystart += height - myOSystem->desktopHeight();
ystart = BSPF_min(ystart, 64u); ystart = BSPF_min(ystart, 64u);
height = myOSystem->desktopHeight(); height = myOSystem->desktopHeight();
myTIA->setYStart(ystart);
myTIA->setHeight(height);
} }
myTIA->setYStart(ystart);
myTIA->setHeight(height);
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -