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

Fixes #339

This commit is contained in:
thrust26 2018-08-08 09:28:03 +02:00
parent 3869c8770c
commit f7d09c772d
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/debugger/TIADebug.cxx
View File

@ -54,7 +54,7 @@ const DebuggerState& TIADebug::getState()
myState.fixedCols.push_back(myTIA.myFixedColorPalette[mode][TIA::P0]);
myState.fixedCols.push_back(myTIA.myFixedColorPalette[mode][TIA::P1]);
myState.fixedCols.push_back(myTIA.myFixedColorPalette[mode][TIA::PF]);
myState.fixedCols.push_back(TIA::FixedColor::BK_GREY);
myState.fixedCols.push_back(myTIA.myFixedColorPalette[mode][TIA::BK]);
myState.fixedCols.push_back(myTIA.myFixedColorPalette[mode][TIA::M0]);
myState.fixedCols.push_back(myTIA.myFixedColorPalette[mode][TIA::M1]);
myState.fixedCols.push_back(myTIA.myFixedColorPalette[mode][TIA::BL]);
@ -1025,7 +1025,7 @@ string TIADebug::debugColors() const
<< " Playfield\n"
<< " " << myTIA.myFixedColorNames[TIA::BL] << " " << colorSwatch(myTIA.myFixedColorPalette[mode][TIA::BL])
<< " Ball\n"
<< " Grey " << colorSwatch(TIA::FixedColor::BK_GREY)
<< " Grey " << colorSwatch(myTIA.myFixedColorPalette[mode][TIA::BK])
<< " Background\n"
<< " White " << colorSwatch(TIA::FixedColor::HBLANK_WHITE)
<< " HMOVE\n";

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

@ -984,7 +984,7 @@ bool TIA::enableFixedColors(bool enable)
myPlayer1.setDebugColor(myFixedColorPalette[layout][FixedObject::P1]);
myBall.setDebugColor(myFixedColorPalette[layout][FixedObject::BL]);
myPlayfield.setDebugColor(myFixedColorPalette[layout][FixedObject::PF]);
myBackground.setDebugColor(FixedColor::BK_GREY);
myBackground.setDebugColor(myFixedColorPalette[layout][FixedObject::BK]);
myMissile0.enableDebugColors(enable);
myMissile1.enableDebugColors(enable);
@ -1042,6 +1042,9 @@ bool TIA::setFixedColorPalette(const string& colors)
break;
}
}
myFixedColorPalette[0][TIA::BK] = FixedColor::NTSC_GREY;
myFixedColorPalette[1][TIA::BK] = FixedColor::PAL_GREY;
// If already in fixed debug colours mode, update the current palette
if(usingFixedColors())

11
src/emucore/tia/TIA.hxx
View File

@ -77,8 +77,9 @@ class TIA : public Device
NTSC_ORANGE = 0x38,
NTSC_YELLOW = 0x1c,
NTSC_GREEN = 0xc4,
NTSC_BLUE = 0x9e,
NTSC_BLUE = 0x9c,
NTSC_PURPLE = 0x66,
NTSC_GREY = 0x04,
PAL_RED = 0x62,
PAL_ORANGE = 0x4a,
@ -86,8 +87,8 @@ class TIA : public Device
PAL_GREEN = 0x34,
PAL_BLUE = 0xbc,
PAL_PURPLE = 0xa6,
PAL_GREY = 0x06,
BK_GREY = 0x0a,
HBLANK_WHITE = 0x0e
};
@ -500,9 +501,9 @@ class TIA : public Device
/**
* Palette and indices for fixed debug colors.
*/
enum FixedObject { P0, M0, P1, M1, PF, BL };
FixedColor myFixedColorPalette[2][6];
string myFixedColorNames[6];
enum FixedObject { P0, M0, P1, M1, PF, BL, BK };
FixedColor myFixedColorPalette[2][7];
string myFixedColorNames[7];
private: