# HG changeset patch # User Jeremy Thurgood # Date 1251645617 0 # Node ID 8a7319e4853aec5adbe705722bc312133a981fa9 # Parent 5d58a5b1373196ee738ed0672aceb8196d500087 Hooked in the game board. diff -r 5d58a5b13731 -r 8a7319e4853a gamelib/engine.py --- a/gamelib/engine.py Sun Aug 30 15:11:44 2009 +0000 +++ b/gamelib/engine.py Sun Aug 30 15:20:17 2009 +0000 @@ -4,6 +4,8 @@ import pygame from pygame.locals import USEREVENT, QUIT, KEYDOWN, K_ESCAPE +import gameboard + class Engine(Game): def __init__(self, main_menu_app): self.main_menu_app = main_menu_app @@ -13,9 +15,13 @@ """Tic toc.""" pygame.time.wait(10) + def create_game_board(self): + self.gameboard = gameboard.GameBoard() + class MainMenuState(State): def event(self, e): if events_equal(e, START_DAY): + self.game.create_game_board() return DayState(self.game) elif e.type is KEYDOWN and e.key == K_ESCAPE: return Quit(self.game) @@ -36,6 +42,17 @@ elif events_equal(e, GO_MAIN_MENU): return MainMenuState(self.game) + def paint(self, screen): + self.game.gameboard.paint(screen) + pygame.display.flip() + + def update(self, screen): + update = self.game.gameboard.update(screen) + pygame.display.update(update) + + def loop(self): + self.game.gameboard.loop() + class NightState(State): def event(self, e): if events_equal(e, START_DAY): diff -r 5d58a5b13731 -r 8a7319e4853a gamelib/gameboard.py --- a/gamelib/gameboard.py Sun Aug 30 15:11:44 2009 +0000 +++ b/gamelib/gameboard.py Sun Aug 30 15:20:17 2009 +0000 @@ -13,12 +13,15 @@ self.tv.tga_load_tiles(data.filepath('tiles.tga'), self.TILE_DIMENSIONS) self.tv.tga_load_level(data.filepath('level1.tga')) + def paint(self, screen): + self.tv.paint(screen) + def update(self, screen): return self.tv.update(screen) def loop(self): - x = random.randint(0, self.size[0]-1) - y = random.randint(0, self.size[1]-1) + x = random.randint(0, self.tv.size[0]-1) + y = random.randint(0, self.tv.size[1]-1) tile = random.randint(0, 4) self.tv.set((x, y), tile)