Mercurial > sypikslang
changeset 165:a5b8d33752a4
Merge.
author | Simon Cross <hodgestar@gmail.com> |
---|---|
date | Fri, 11 May 2012 23:22:20 +0200 |
parents | 7beac783139b (current diff) 80cce62f29fb (diff) |
children | a82cab951ce2 |
files | |
diffstat | 5 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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)