From 1888152955df9a3f861057f805672db27306eea8 Mon Sep 17 00:00:00 2001 From: bwmott Date: Wed, 9 Aug 2006 02:19:49 +0000 Subject: [PATCH] Fix a bug related to the priority of P1 and M1 over the playfield on the left side of the screen when score mode is enabled. This was pointed out by Darrell Spice, Jr. during his work on Medieval Mayhem. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1116 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba --- stella/src/emucore/TIA.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stella/src/emucore/TIA.cxx b/stella/src/emucore/TIA.cxx index d9598d39e..c4dbd1f85 100644 --- a/stella/src/emucore/TIA.cxx +++ b/stella/src/emucore/TIA.cxx @@ -13,7 +13,7 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: TIA.cxx,v 1.66 2006-03-05 01:18:42 stephena Exp $ +// $Id: TIA.cxx,v 1.67 2006-08-09 02:19:49 bwmott Exp $ //============================================================================ #include @@ -85,7 +85,7 @@ TIA::TIA(const Console& console, Settings& settings) if((enabled & myPFBit) != 0) color = (enabled & ScoreBit) ? ((x == 0) ? 2 : 3) : 1; if((enabled & (myP1Bit | myM1Bit)) != 0) - color = 3; + color = (color != 2) ? 3 : 2; if((enabled & (myP0Bit | myM0Bit)) != 0) color = 2;