# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1323553777 -3600
# Node ID 02f31fb1a653026b34fcce3e556c2409e397ae88
# Parent  fd5a742b1d07e5f3e8eb372cb4687039963784f5# Parent  38b74d685867bf2a2f1e9b680b1fcb145b6eb0fc
Merged general changes.

diff -r fd5a742b1d07 -r 02f31fb1a653 main.py
--- a/main.py	Sat Dec 10 21:22:12 2011 +0100
+++ b/main.py	Sat Dec 10 22:49:37 2011 +0100
@@ -9,6 +9,7 @@
 
 def update_surface(surface_array, screen_array):
     surface_array[:] = screen_array
+    surface_array *= INTENSITY
 
 def mainloop():
     while 1:
diff -r fd5a742b1d07 -r 02f31fb1a653 ula.py
--- a/ula.py	Sat Dec 10 21:22:12 2011 +0100
+++ b/ula.py	Sat Dec 10 22:49:37 2011 +0100
@@ -28,8 +28,7 @@
         x = 0
         while x < WIDTH:
             colour = ula.get_pixel_colour()
-            pixel = tuple(map(lambda x: x * INTENSITY, colour))
-            screen[x][y] = pixel
+            screen[x][y] = colour
             x += 1
         ula.hsync()
         y += 1