# HG changeset patch
# User Simon Cross <hodgestar@gmail.com>
# Date 1336771340 -7200
# Node ID a5b8d33752a41efb16565388d2f2b395b9ccced0
# Parent  7beac783139b2fe447f1555001d7179abd72f316# Parent  80cce62f29fbb0ac2dc919a4842a38914c5ac09e
Merge.

diff -r 7beac783139b -r a5b8d33752a4 data/icons/icon.ico
Binary file data/icons/icon.ico has changed
diff -r 7beac783139b -r a5b8d33752a4 data/icons/icon_128.png
Binary file data/icons/icon_128.png has changed
diff -r 7beac783139b -r a5b8d33752a4 data/icons/icon_24.png
Binary file data/icons/icon_24.png has changed
diff -r 7beac783139b -r a5b8d33752a4 gamelib/constants.py
--- a/gamelib/constants.py	Fri May 11 23:21:15 2012 +0200
+++ b/gamelib/constants.py	Fri May 11 23:22:20 2012 +0200
@@ -5,6 +5,8 @@
 SCREEN = (WIDTH, HEIGHT)
 FPS = 30
 
+WINDOW_ICON = "icons/icon_24.png"
+
 # Sound related (standard options)
 FREQ = 44100
 BITSIZE = -16  # unsigned 16 bit
diff -r 7beac783139b -r a5b8d33752a4 gamelib/main.py
--- a/gamelib/main.py	Fri May 11 23:21:15 2012 +0200
+++ b/gamelib/main.py	Fri May 11 23:22:20 2012 +0200
@@ -10,9 +10,11 @@
 import sys
 
 from gamelib.engine import Engine
+from gamelib.data import load_image
 from gamelib.mainmenu import MainMenu
 
-from gamelib.constants import SCREEN, FREQ, BITSIZE, CHANNELS, BUFFER
+from gamelib.constants import (SCREEN, FREQ, BITSIZE, CHANNELS, BUFFER,
+        WINDOW_ICON)
 
 
 def parse_args(args):
@@ -34,6 +36,7 @@
     if opts.sound:
         pygame.mixer.init(FREQ, BITSIZE, CHANNELS, BUFFER)
     screen = pygame.display.set_mode(SCREEN)
+    pygame.display.set_icon(load_image(WINDOW_ICON))
     engine = Engine(screen)
     window = MainMenu(screen, opts.load)
     engine.run(window)