[pypy-svn] r62260 - in pypy/trunk/pypy/lang/gameboy: . debug

[cami at codespeak.net]

Author: cami
Date: Fri Feb 27 23:45:22 2009
New Revision: 62260

Modified:
   pypy/trunk/pypy/lang/gameboy/debug/debug_util.py
   pypy/trunk/pypy/lang/gameboy/video.py
   pypy/trunk/pypy/lang/gameboy/video_sprite.py
Log:
fixing wrong variable name in video
small reformatting


Modified: pypy/trunk/pypy/lang/gameboy/debug/debug_util.py
==============================================================================
--- pypy/trunk/pypy/lang/gameboy/debug/debug_util.py	(original)
+++ pypy/trunk/pypy/lang/gameboy/debug/debug_util.py	Fri Feb 27 23:45:22 2009
@@ -7,7 +7,7 @@
 #
 # ----------------------------------------------------------------------------
 
-DEBUG = True
+DEBUG = False
 DEBUG_PRINT_LOGS = True
 op_codes               = [0] * (0xFF+1)
 fetch_execute_op_codes = [0] * (0xFF+1)

Modified: pypy/trunk/pypy/lang/gameboy/video.py
==============================================================================
--- pypy/trunk/pypy/lang/gameboy/video.py	(original)
+++ pypy/trunk/pypy/lang/gameboy/video.py	Fri Feb 27 23:45:22 2009
@@ -605,7 +605,7 @@
                 if (self.objects[right] >> 20) > \
                    (self.objects[highest] >> 20):
                     highest = right
-            self.objects[index], self.objects[rightmost] = self.objects[rightmost], self.objects[index]
+            self.objects[index], self.objects[highest] = self.objects[highest], self.objects[index]
 
     def draw_tiles(self, x, tile_map, tile_data):
         while x < GAMEBOY_SCREEN_WIDTH+SPRITE_SIZE:

Modified: pypy/trunk/pypy/lang/gameboy/video_sprite.py
==============================================================================
--- pypy/trunk/pypy/lang/gameboy/video_sprite.py	(original)
+++ pypy/trunk/pypy/lang/gameboy/video_sprite.py	Fri Feb 27 23:45:22 2009
@@ -256,8 +256,8 @@
             self.video.line[x] = 0x00
     
     def draw_line(self, line_y):
-        y          = (self.scroll_y + line_y) & 0xFF
-        x          = self.scroll_x            & 0xFF
+        y = (self.scroll_y + line_y) & 0xFF
+        x = self.scroll_x            & 0xFF
         tile_map, tile_data = self.prepare_background_data(x, y)
         self.video.draw_tiles(8 - (x & 7), tile_map, tile_data)