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

Fix #345; color-loss not correctly initialized.

This commit is contained in:
Stephen Anthony 2018-08-09 10:54:26 -02:30
parent 1571860dc0
commit ae96406fd4
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/RewindManager.cxx
View File

@ -38,7 +38,7 @@ void RewindManager::setup()
{ {
myLastTimeMachineAdd = false; myLastTimeMachineAdd = false;
string prefix = myOSystem.settings().getBool("dev.settings") ? "dev." : "plr."; const string& prefix = myOSystem.settings().getBool("dev.settings") ? "dev." : "plr.";
mySize = myOSystem.settings().getInt(prefix + "tm.size"); mySize = myOSystem.settings().getInt(prefix + "tm.size");
if(mySize != myStateList.capacity()) if(mySize != myStateList.capacity())

2
src/emucore/CartBUS.cxx
View File

@ -64,7 +64,7 @@ CartridgeBUS::CartridgeBUS(const BytePtr& image, uInt32 size,
myDisplayImage = myBUSRAM + DSRAM; myDisplayImage = myBUSRAM + DSRAM;
// Create Thumbulator ARM emulator // Create Thumbulator ARM emulator
string prefix = settings.getBool("dev.settings") ? "plr." : "dev."; const string& prefix = settings.getBool("dev.settings") ? "plr." : "dev.";
myThumbEmulator = make_unique<Thumbulator>( myThumbEmulator = make_unique<Thumbulator>(
reinterpret_cast<uInt16*>(myImage), reinterpret_cast<uInt16*>(myBUSRAM), reinterpret_cast<uInt16*>(myImage), reinterpret_cast<uInt16*>(myBUSRAM),
settings.getBool(prefix + "thumb.trapfatal"), Thumbulator::ConfigureFor::BUS, this settings.getBool(prefix + "thumb.trapfatal"), Thumbulator::ConfigureFor::BUS, this

2
src/emucore/CartCDF.cxx
View File

@ -67,7 +67,7 @@ CartridgeCDF::CartridgeCDF(const BytePtr& image, uInt32 size,
setVersion(); setVersion();
// Create Thumbulator ARM emulator // Create Thumbulator ARM emulator
string prefix = settings.getBool("dev.settings") ? "plr." : "dev."; const string& prefix = settings.getBool("dev.settings") ? "plr." : "dev.";
myThumbEmulator = make_unique<Thumbulator>( myThumbEmulator = make_unique<Thumbulator>(
reinterpret_cast<uInt16*>(myImage), reinterpret_cast<uInt16*>(myCDFRAM), reinterpret_cast<uInt16*>(myImage), reinterpret_cast<uInt16*>(myCDFRAM),
settings.getBool(prefix + "thumb.trapfatal"), myVersion ? settings.getBool(prefix + "thumb.trapfatal"), myVersion ?

2
src/emucore/CartDPCPlus.cxx
View File

@ -53,7 +53,7 @@ CartridgeDPCPlus::CartridgeDPCPlus(const BytePtr& image, uInt32 size,
myFrequencyImage = myDisplayImage + 0x1000; myFrequencyImage = myDisplayImage + 0x1000;
// Create Thumbulator ARM emulator // Create Thumbulator ARM emulator
string prefix = settings.getBool("dev.settings") ? "plr." : "dev."; const string& prefix = settings.getBool("dev.settings") ? "plr." : "dev.";
myThumbEmulator = make_unique<Thumbulator> myThumbEmulator = make_unique<Thumbulator>
(reinterpret_cast<uInt16*>(myImage), (reinterpret_cast<uInt16*>(myImage),
reinterpret_cast<uInt16*>(myDPCRAM), reinterpret_cast<uInt16*>(myDPCRAM),

2
src/emucore/tia/TIA.cxx
View File

@ -200,7 +200,7 @@ void TIA::frameReset()
memset(myBackBuffer, 0, 160 * TIAConstants::frameBufferHeight); memset(myBackBuffer, 0, 160 * TIAConstants::frameBufferHeight);
memset(myFrontBuffer, 0, 160 * TIAConstants::frameBufferHeight); memset(myFrontBuffer, 0, 160 * TIAConstants::frameBufferHeight);
memset(myFramebuffer, 0, 160 * TIAConstants::frameBufferHeight); memset(myFramebuffer, 0, 160 * TIAConstants::frameBufferHeight);
enableColorLoss(mySettings.getBool("dev.settings") ? "dev.colorloss" : "plr.colorloss"); enableColorLoss(mySettings.getBool(mySettings.getBool("dev.settings") ? "dev.colorloss" : "plr.colorloss"));
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -