Mercurial > sypikslang

comparison gamelib/gamegui.py @ 134:208a79a49c26

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix a ordering bug triggered when restoring a game
author Neil Muller <drnlmuller@gmail.com>
date Thu, 10 May 2012 17:06:48 +0200
parents e1142e2289d8
children 14917385a0fd
comparison
equal deleted inserted replaced
133:e1142e2289d8 134:208a79a49c26
533 def __init__(self, screen, game_dict): 533 def __init__(self, screen, game_dict):
534 self.game = Game(game_dict) 534 self.game = Game(game_dict)
535 super(LabWindow, self).__init__(screen, self.game) 535 super(LabWindow, self).__init__(screen, self.game)
536 self.autosave = get_save_filename() 536 self.autosave = get_save_filename()
537 537
538 # Ensure we setup everything with the correct state set
539 self.game.start_turn()
540
538 self.develop = DevelopmentWindow(screen, self) 541 self.develop = DevelopmentWindow(screen, self)
539 self.activity = ActivityWindow(screen, self, self.develop) 542 self.activity = ActivityWindow(screen, self, self.develop)
540 self.develop.set_activity_window(self.activity) 543 self.develop.set_activity_window(self.activity)
541 544
542 devbut = SwitchWinButton((150, 10), 'Development', self.develop) 545 devbut = SwitchWinButton((150, 10), 'Development', self.develop)
544 actbut = SwitchWinButton((300, 10), 'Activities', self.activity) 547 actbut = SwitchWinButton((300, 10), 'Activities', self.activity)
545 self.add_child(actbut) 548 self.add_child(actbut)
546 549
547 self._sciences = [] 550 self._sciences = []
548 # Setup for the first turn 551 # Setup for the first turn
549 self.game.start_turn()
550 self.update_labels() 552 self.update_labels()
551 self._make_science_widgets() 553 self._make_science_widgets()
552 554
553 def _make_science_widgets(self): 555 def _make_science_widgets(self):
554 # FIXME: Horrible hackery 556 # FIXME: Horrible hackery