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

Fixed bug in 'fixed debug colors' for playfield graphics; 

it should always display the playfield colour, even if it
would normally use P0/P1 colours in normal mode.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2317 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2011-12-31 01:52:24 +00:00
parent af9e1075d4
commit 2047804903
1 changed files with 56 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
src/emucore/TIA.cxx
View File

@ -62,54 +62,8 @@ TIA::TIA(Console& console, Sound& sound, Settings& settings)
// Make sure all TIA bits are enabled // Make sure all TIA bits are enabled
enableBits(true); enableBits(true);
for(uInt16 x = 0; x < 2; ++x) // Turn off debug colours (this also sets up the PriorityEncoder)
{ toggleFixedColors(0);
for(uInt16 enabled = 0; enabled < 256; ++enabled)
{
if(enabled & PriorityBit)
{
// Priority from highest to lowest:
// PF/BL => P0/M0 => P1/M1 => BK
uInt8 color = _BK;
if((enabled & M1Bit) != 0)
color = _M1;
if((enabled & P1Bit) != 0)
color = _P1;
if((enabled & M0Bit) != 0)
color = _M0;
if((enabled & P0Bit) != 0)
color = _P0;
if((enabled & BLBit) != 0)
color = _BL;
if((enabled & PFBit) != 0)
color = _PF; // NOTE: Playfield has priority so ScoreBit isn't used
myPriorityEncoder[x][enabled] = color;
}
else
{
// Priority from highest to lowest:
// P0/M0 => P1/M1 => PF/BL => BK
uInt8 color = _BK;
if((enabled & BLBit) != 0)
color = _BL;
if((enabled & PFBit) != 0)
color = (enabled & ScoreBit) ? ((x == 0) ? _P0 : _P1) : _PF;
if((enabled & M1Bit) != 0)
color = _M1;
if((enabled & P1Bit) != 0)
color = _P1;
if((enabled & M0Bit) != 0)
color = _M0;
if((enabled & P0Bit) != 0)
color = _P0;
myPriorityEncoder[x][enabled] = color;
}
}
}
// Compute all of the mask tables // Compute all of the mask tables
TIATables::computeAllTables(); TIATables::computeAllTables();
@ -137,7 +91,6 @@ void TIA::reset()
myAllowHMOVEBlanks = true; myAllowHMOVEBlanks = true;
// Some default values for the registers // Some default values for the registers
myColorPtr = myColor;
myVSYNC = myVBLANK = 0; myVSYNC = myVBLANK = 0;
myNUSIZ0 = myNUSIZ1 = 0; myNUSIZ0 = myNUSIZ1 = 0;
myColor[_P0] = myColor[_P1] = myColor[_PF] = myColor[_BK] = 0; myColor[_P0] = myColor[_P1] = myColor[_PF] = myColor[_BK] = 0;
@ -221,6 +174,7 @@ void TIA::reset()
myCurrentPFMask = TIATables::PFMask[0]; myCurrentPFMask = TIATables::PFMask[0];
// Recalculate the size of the display // Recalculate the size of the display
toggleFixedColors(0);
frameReset(); frameReset();
} }
@ -515,8 +469,8 @@ bool TIA::load(Serializer& in)
// Reset TIA bits to be on // Reset TIA bits to be on
enableBits(true); enableBits(true);
toggleFixedColors(0);
myAllowHMOVEBlanks = true; myAllowHMOVEBlanks = true;
myColorPtr = myColor;
} }
catch(const char* msg) catch(const char* msg)
{ {
@ -806,6 +760,58 @@ bool TIA::toggleFixedColors(uInt8 mode)
if(on) myColorPtr = myFixedColor; if(on) myColorPtr = myFixedColor;
else myColorPtr = myColor; else myColorPtr = myColor;
// Set PriorityEncoder
// This needs to be done here, since toggling debug colours also changes
// how colours are interpreted in PF 'score' mode
for(uInt16 x = 0; x < 2; ++x)
{
for(uInt16 enabled = 0; enabled < 256; ++enabled)
{
if(enabled & PriorityBit)
{
// Priority from highest to lowest:
// PF/BL => P0/M0 => P1/M1 => BK
uInt8 color = _BK;
if((enabled & M1Bit) != 0)
color = _M1;
if((enabled & P1Bit) != 0)
color = _P1;
if((enabled & M0Bit) != 0)
color = _M0;
if((enabled & P0Bit) != 0)
color = _P0;
if((enabled & BLBit) != 0)
color = _BL;
if((enabled & PFBit) != 0)
color = _PF; // NOTE: Playfield has priority so ScoreBit isn't used
myPriorityEncoder[x][enabled] = color;
}
else
{
// Priority from highest to lowest:
// P0/M0 => P1/M1 => PF/BL => BK
uInt8 color = _BK;
if((enabled & BLBit) != 0)
color = _BL;
if((enabled & PFBit) != 0)
color = (!on && (enabled & ScoreBit)) ? ((x == 0) ? _P0 : _P1) : _PF;
if((enabled & M1Bit) != 0)
color = _M1;
if((enabled & P1Bit) != 0)
color = _P1;
if((enabled & M0Bit) != 0)
color = _M0;
if((enabled & P0Bit) != 0)
color = _P0;
myPriorityEncoder[x][enabled] = color;
}
}
}
return on; return on;
} }