From 38a58128391a70c21dd66a0989d53b32dfa9f110 Mon Sep 17 00:00:00 2001 From: Nicholas Dyer Date: Sat, 13 May 2023 10:17:30 -0400 Subject: [PATCH] re-enabled the game lol --- pocket_friends/game_files/game.py | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/pocket_friends/game_files/game.py b/pocket_friends/game_files/game.py index 782365d..50bafac 100644 --- a/pocket_friends/game_files/game.py +++ b/pocket_friends/game_files/game.py @@ -46,7 +46,7 @@ def game(windowed=False): screen_size = 240 window = pygame.display.set_mode((screen_size, screen_size)) - surface = pygame.Surface((game_res, game_res)) + surface = surface_modules.get(starting_surface).Surface((game_res, game_res), resources_dir, game_fps) # Only really useful for PCs. Does nothing on the Raspberry Pi. pygame.display.set_caption('Pocket Friends {0}'.format(pocket_friends.__version__)) @@ -59,25 +59,18 @@ def game(windowed=False): running = True - #surface = surface_modules.get(starting_surface).Surface((game_res, game_res), resources_dir, game_fps) - surface.fill((255, 0, 0)) - - # Default game state when the game first starts. - running = True - while running: - #surface.update() - surface.fill((255, 0, 0)) + surface.update() frame = pygame.transform.scale(surface, (screen_size, screen_size)) window.blit(frame, frame.get_rect()) - #if not surface.running: - # next_surface = surface.next_surface - # additional_args = surface.additional_args - # if next_surface not in valid_surfaces: - # next_surface = 'error_screen' - # surface = surface_modules.get(next_surface).Surface((game_res, game_res), resources_dir, - # game_fps, **additional_args) + if not surface.running: + next_surface = surface.next_surface + additional_args = surface.additional_args + if next_surface not in valid_surfaces: + next_surface = 'error_screen' + surface = surface_modules.get(next_surface).Surface((game_res, game_res), resources_dir, + game_fps, **additional_args) pygame.display.flip()