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

fix #341

This commit is contained in:
thrust26 2018-08-09 14:55:46 +02:00
parent c6086184de
commit 1571860dc0
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/emucore/Console.cxx
View File

@ -491,6 +491,9 @@ void Console::setPalette(const string& type)
palettes[paletteNum][0];
myOSystem.frameBuffer().setPalette(palette);
if(myTIA->usingFixedColors())
myTIA->enableFixedColors(true);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

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

@ -973,18 +973,15 @@ bool TIA::toggleCollisions()
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
bool TIA::enableFixedColors(bool enable)
{
// This will be called during reset at a point where no frame manager
// instance is available, so we guard aginst this here.
int layout = 0;
if (myFrameManager) layout = myFrameManager->layout() == FrameLayout::pal ? 1 : 0;
int timing = consoleTiming() == ConsoleTiming::pal ? 1 : 0;
myMissile0.setDebugColor(myFixedColorPalette[layout][FixedObject::M0]);
myMissile1.setDebugColor(myFixedColorPalette[layout][FixedObject::M1]);
myPlayer0.setDebugColor(myFixedColorPalette[layout][FixedObject::P0]);
myPlayer1.setDebugColor(myFixedColorPalette[layout][FixedObject::P1]);
myBall.setDebugColor(myFixedColorPalette[layout][FixedObject::BL]);
myPlayfield.setDebugColor(myFixedColorPalette[layout][FixedObject::PF]);
myBackground.setDebugColor(myFixedColorPalette[layout][FixedObject::BK]);
myMissile0.setDebugColor(myFixedColorPalette[timing][FixedObject::M0]);
myMissile1.setDebugColor(myFixedColorPalette[timing][FixedObject::M1]);
myPlayer0.setDebugColor(myFixedColorPalette[timing][FixedObject::P0]);
myPlayer1.setDebugColor(myFixedColorPalette[timing][FixedObject::P1]);
myBall.setDebugColor(myFixedColorPalette[timing][FixedObject::BL]);
myPlayfield.setDebugColor(myFixedColorPalette[timing][FixedObject::PF]);
myBackground.setDebugColor(myFixedColorPalette[timing][FixedObject::BK]);
myMissile0.enableDebugColors(enable);
myMissile1.enableDebugColors(enable);