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

Fixed "new console created" messages appearing when loading a ROM 

from the launcher.  This message should only appear when *reloading*
a ROM, not creating a new one completely.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2662 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2013-03-07 17:41:19 +00:00
parent 5d5719e390
commit 2bde61558d
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Changes.txt
View File

@ -16,6 +16,9 @@
* Disassembly from debugger ... * Disassembly from debugger ...
* Fixed redundant "New console created" message when entering the same
ROM multiple times from the ROM launcher.
-Have fun! -Have fun!

10
src/emucore/OSystem.cxx
View File

@ -501,17 +501,16 @@ void OSystem::createSound()
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
bool OSystem::createConsole(const FilesystemNode& rom, const string& md5sum) bool OSystem::createConsole(const FilesystemNode& rom, const string& md5sum,
bool newrom)
{ {
ostringstream buf;
// Do a little error checking; it shouldn't be necessary // Do a little error checking; it shouldn't be necessary
if(myConsole) deleteConsole(); if(myConsole) deleteConsole();
bool showmessage = false; bool showmessage = false;
// If same ROM has been given, we reload the current one (assuming one exists) // If same ROM has been given, we reload the current one (assuming one exists)
if(rom == myRomFile) if(!newrom && rom == myRomFile)
{ {
showmessage = true; // we show a message if a ROM is being reloaded showmessage = true; // we show a message if a ROM is being reloaded
} }
@ -527,6 +526,7 @@ bool OSystem::createConsole(const FilesystemNode& rom, const string& md5sum)
} }
// Create an instance of the 2600 game console // Create an instance of the 2600 game console
ostringstream buf;
string type, id; string type, id;
myConsole = openConsole(myRomFile, myRomMD5, type, id); myConsole = openConsole(myRomFile, myRomMD5, type, id);
if(myConsole) if(myConsole)
@ -617,7 +617,7 @@ void OSystem::deleteConsole()
bool OSystem::reloadConsole() bool OSystem::reloadConsole()
{ {
deleteConsole(); deleteConsole();
return createConsole(myRomFile); return createConsole(myRomFile, myRomMD5, false);
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

8
src/emucore/OSystem.hxx
View File

@ -373,12 +373,14 @@ class OSystem
Creates a new game console from the specified romfile, and correctly Creates a new game console from the specified romfile, and correctly
initializes the system state to start emulation of the Console. initializes the system state to start emulation of the Console.
@param rom The FSNode of the ROM to use (contains path, etc) @param rom The FSNode of the ROM to use (contains path, etc)
@param md5 The MD5sum of the ROM @param md5 The MD5sum of the ROM
@param newrom Whether this is a new ROM, or a reload of current one
@return True on successful creation, otherwise false @return True on successful creation, otherwise false
*/ */
bool createConsole(const FilesystemNode& rom, const string& md5 = ""); bool createConsole(const FilesystemNode& rom, const string& md5 = "",
bool newrom = true);
/** /**
Deletes the currently defined console, if it exists. Deletes the currently defined console, if it exists.