[pypy-svn] r60217 - pypy/trunk/pypy/lang/gameboy

[tverwaes at codespeak.net]

Author: tverwaes
Date: Fri Nov 28 20:53:59 2008
New Revision: 60217

Modified:
   pypy/trunk/pypy/lang/gameboy/constants.py
   pypy/trunk/pypy/lang/gameboy/video.py
Log:
removed use of constants.COLOR_MAP altogether. Also ensured it isn't used
anymore by commenting it out.


Modified: pypy/trunk/pypy/lang/gameboy/constants.py
==============================================================================
--- pypy/trunk/pypy/lang/gameboy/constants.py	(original)
+++ pypy/trunk/pypy/lang/gameboy/constants.py	Fri Nov 28 20:53:59 2008
@@ -146,13 +146,11 @@
 OBJECTS_PER_LINE   = 10
  
 # LCD Color Palette
-COLOR_MAP =[
- #0x9CB916, 0x8CAA14, 0x306430, 0x103F10
- 0, 1, 2, 3 # These are indices in the COLOR_MAP provided by the
-            # implementation...
+#COLOR_MAP =[
+# 0x9CB916, 0x8CAA14, 0x306430, 0x103F10
  # 0xE0F8D0, 0x88C070, 0x386850, 0x081820
  # 0xFFFFFF, 0xAAAAAA, 0x555555, 0x000000
- ]
+# ]
 
 
 

Modified: pypy/trunk/pypy/lang/gameboy/video.py
==============================================================================
--- pypy/trunk/pypy/lang/gameboy/video.py	(original)
+++ pypy/trunk/pypy/lang/gameboy/video.py	Fri Nov 28 20:53:59 2008
@@ -666,8 +666,8 @@
                 color = (self.object_palette_1 >> ((((pattern >> 4) & 0x02) +\
                         ((pattern >> 1) & 0x01)) << 1)) & 0x03
             index = ((pattern & 0x30) << 4) + (pattern & 0x0F)
-            self.palette[index] = constants.COLOR_MAP[color]
-            #self.palette[index] = color
+            #self.palette[index] = constants.COLOR_MAP[color]
+            self.palette[index] = color
         self.dirty = False
 
 # ------------------------------------------------------------------------------