From 533a74c4fa991079e1200f08573484c8eeb79c4e Mon Sep 17 00:00:00 2001 From: staubsauger Date: Mon, 19 Aug 2024 10:11:33 +0200 Subject: [PATCH] fixed typo and made window closable --- g.py | 2 +- game/screens/__init__.py | 5 +++-- main.py | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/g.py b/g.py index 4ad6c76..27e786a 100644 --- a/g.py +++ b/g.py @@ -36,5 +36,5 @@ sdl_renderer: tcod.sdl.render.Renderer atlas: tcod.render.SDLTilesetAtlas """The tileset atlas""" -console_reder: tcod.render.SDLConsoleRender +console_render: tcod.render.SDLConsoleRender """The console renderer""" diff --git a/game/screens/__init__.py b/game/screens/__init__.py index ee3b6e8..0ca9718 100644 --- a/game/screens/__init__.py +++ b/game/screens/__init__.py @@ -53,7 +53,7 @@ def main_draw() -> None: g.console.clear() g.screens[-1].on_draw(g.console) # g.context.present(g.console) - g.sdl_renderer.copy(g.console_reder.render(g.console)) + g.sdl_renderer.copy(g.console_render.render(g.console)) g.sdl_renderer.present() @@ -82,7 +82,8 @@ def main_loop() -> None: tile_event = g.context.convert_event(event) if g.screens: _apply_screen_result(g.screens[-1].on_event(tile_event)) - + if isinstance(event, tcod.event.Quit): + g.screens.pop() def get_previous_screen(screen: Screen) -> Screen | None: """Return the screen before `screen` in the stack if it exists.""" diff --git a/main.py b/main.py index 3d6f18b..8a59ea8 100755 --- a/main.py +++ b/main.py @@ -28,7 +28,7 @@ def main() -> None: g.sdl_renderer = tcod.sdl.render.new_renderer(g.sdl_window, target_textures=True) g.atlas = tcod.render.SDLTilesetAtlas(g.sdl_renderer, g.tileset) - g.console_reder = tcod.render.SDLConsoleRender(atlas=g.atlas) + g.console_render = tcod.render.SDLConsoleRender(atlas=g.atlas) with tcod.context.new(console=g.console, tileset=g.tileset) as g.context: game.screens.main_loop()