X-Git-Url: https://git.ctpug.org.za/?p=tabakrolletjie.git;a=blobdiff_plain;f=tabakrolletjie%2Fscenes%2Fmenu.py;h=89b531e2621d78f69ec75e7869fb880104c5e3b5;hp=67336112c6c3e7a65151bfb524d23117bf1c7369;hb=b11c77fa61109312d3414b176a11f051fcc59d74;hpb=aaa8898c0c3a0b915325653ffb9e9398ff37d9b2 diff --git a/tabakrolletjie/scenes/menu.py b/tabakrolletjie/scenes/menu.py index 6733611..89b531e 100644 --- a/tabakrolletjie/scenes/menu.py +++ b/tabakrolletjie/scenes/menu.py @@ -7,7 +7,7 @@ from ..events import QuitEvent, SceneChangeEvent from ..loader import loader from ..constants import FONTS from ..widgets import TextButton, SpacerButton -from ..utils import save_file_exists +from ..utils import save_file_exists, get_save_data class MenuScene(BaseScene): @@ -50,11 +50,12 @@ class MenuScene(BaseScene): return button.name return None - def _do_day(self): + def _do_load_save(self, gamestate): + gamestate.load_from_json(get_save_data()) from .day import DayScene SceneChangeEvent.post(scene=DayScene()) - def _do_load_level(self): + def _start_new_game(self): from .load_level import LoadLevelScene SceneChangeEvent.post(scene=LoadLevelScene()) @@ -72,15 +73,15 @@ class MenuScene(BaseScene): elif ev.key == pgl.K_d: self._do_day() elif ev.key == pgl.K_l: - self._do_load_level() + self._start_new_game() elif ev.key == pgl.K_h: self._do_help() elif ev.type == pgl.MOUSEBUTTONDOWN: pressed = self._get_pressed(ev) if pressed == 'new game': - self._do_load_level() + self._start_new_game() elif pressed == 'continue': - self._do_day() + self._do_load_save(gamestate) elif pressed == 'help': self._do_help() elif pressed == 'quit':