Mercurial > undermine
changeset 24:7ac4236657b6
move display out of Game
| author | Radomir Dopieralski <sheep-devel@sheep.art.pl> |
|---|---|
| date | Sun, 27 Apr 2014 17:56:55 +0200 |
| parents | e818799dbeb0 |
| children | 40ce7ecc1265 |
| files | __main__.py undermine/game.py |
| diffstat | 2 files changed, 7 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/__main__.py Sun Apr 27 17:53:34 2014 +0200 +++ b/__main__.py Sun Apr 27 17:56:55 2014 +0200 @@ -4,8 +4,12 @@ import pygame import undermine.game +import undermine.display +MAP_SIZE = 12, 12 + pygame.display.init() pygame.mixer.init() -undermine.game.Game().run() +display = undermine.display.Display((MAP_SIZE[0] * 64, MAP_SIZE[1] * 64)) +undermine.game.Game(display, map_size=MAP_SIZE).run()
--- a/undermine/game.py Sun Apr 27 17:53:34 2014 +0200 +++ b/undermine/game.py Sun Apr 27 17:56:55 2014 +0200 @@ -5,17 +5,15 @@ import pygame -import undermine.display import undermine.resources import undermine.sprites import undermine.level class Game(object): - def __init__(self, fps=24, map_size=(12, 12)): + def __init__(self, display, fps=24, map_size=(12, 12)): self.fps = fps - self.display = undermine.display.Display( - (map_size[0] * 64, map_size[1] * 64)) + self.display = display self.clock = pygame.time.Clock() self.images = undermine.resources.load_atlas('undermine.png', 64) # self.theme = undermine.resources.load_sound('undermine.ogg')