completely remove paletted color support

[drnoksnes] / ppu.cpp

diff --git a/ppu.cpp b/ppu.cpp
index 1bc2d41..7dcc9cf 100644 (file)
--- a/ppu.cpp
+++ b/ppu.cpp
@@ -128,10 +128,6 @@ void S9xUpdateHTimer ()
 void S9xFixColourBrightness ()
 {
     IPPU.XB = mul_brightness [PPU.Brightness];
-#ifndef _SNESPPC
-    if (Settings.SixteenBit)
-#endif
-    {
        for (int i = 0; i < 256; i++)
        {
            IPPU.Red [i] = IPPU.XB [PPU.CGDATA [i] & 0x1f];
@@ -140,7 +136,6 @@ void S9xFixColourBrightness ()
            IPPU.ScreenColors [i] = BUILD_PIXEL (IPPU.Red [i], IPPU.Green [i],
                                                 IPPU.Blue [i]);
        }
-    }
 }
 
 /**********************************************************************************************/
@@ -1338,13 +1333,13 @@ uint8 S9xGetPPU(uint16 Address)
                                                CPU.BranchSkip = TRUE;
                                                break;
                                }
-                               if (Address & 3 < 2)
+                               if ((Address & 3) < 2)
                                {
                                        int r = rand();
                                        if (r & 2)
                                        {
                                                if (r & 4)
-                                                       return (Address & 3 == 1 ? 0xaa : 0xbb);
+                                                       return ((Address & 3) == 1 ? 0xaa : 0xbb);
                                                else
                                                        return ((r >> 3) & 0xff);
                                        }