Mercurial > rinkhals

comparison gamelib/gameboard.py @ 524:1eed8c861580

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix some indentation weirdnesses that have crept in
author Neil Muller <drnlmuller@gmail.com>
date Fri, 27 Nov 2009 14:44:38 +0000
parents 103b0fc36722
children d9886377b6a2
comparison
equal deleted inserted replaced
523:103b0fc36722 524:1eed8c861580
718 if tile_pos: 718 if tile_pos:
719 chicken = self.get_outside_chicken(tile_pos) 719 chicken = self.get_outside_chicken(tile_pos)
720 if chicken is None: 720 if chicken is None:
721 building = self.get_building(tile_pos) 721 building = self.get_building(tile_pos)
722 if not (building and building.ABODE): 722 if not (building and building.ABODE):
723 return 723 return
724 # Bounce through open dialog once more 724 # Bounce through open dialog once more
725 self.open_building_dialog(building, False, do_equip) 725 self.open_building_dialog(building, False, do_equip)
726 else: 726 else:
727 do_equip(chicken) 727 do_equip(chicken)
728 else: 728 else:
813 if e.key == K_RIGHT: 813 if e.key == K_RIGHT:
814 self.tvw.move_view(constants.TILE_DIMENSIONS[0], 0) 814 self.tvw.move_view(constants.TILE_DIMENSIONS[0], 0)
815 return True 815 return True
816 elif e.type == KEYDOWN and e.key in \ 816 elif e.type == KEYDOWN and e.key in \
817 [K_0, K_1, K_2, K_3, K_4, K_5, K_6, K_7, K_8, K_9]: 817 [K_0, K_1, K_2, K_3, K_4, K_5, K_6, K_7, K_8, K_9]:
818 mods = pygame.key.get_mods() 818 mods = pygame.key.get_mods()
819 if mods & KMOD_CTRL: 819 if mods & KMOD_CTRL:
820 # store current selection 820 # store current selection
821 self.stored_selections[e.key] = self.selected_chickens[:] 821 self.stored_selections[e.key] = self.selected_chickens[:]
822 else: 822 else:
823 self.restore_selection(self.stored_selections.get(e.key, [])) 823 self.restore_selection(self.stored_selections.get(e.key, []))
824 elif e.type == KEYDOWN: 824 elif e.type == KEYDOWN:
825 mods = pygame.key.get_mods() 825 mods = pygame.key.get_mods()
826 if mods & KMOD_CTRL and self.selected_tool == constants.TOOL_SELECT_CHICKENS and self.selected_chickens: 826 if mods & KMOD_CTRL and self.selected_tool == constants.TOOL_SELECT_CHICKENS and self.selected_chickens:
827 pygame.mouse.set_cursor(*cursors.cursors['chicken']) 827 pygame.mouse.set_cursor(*cursors.cursors['chicken'])
828 elif e.type == KEYUP: 828 elif e.type == KEYUP:
829 mods = pygame.key.get_mods() 829 mods = pygame.key.get_mods()
830 if not (mods & KMOD_CTRL) and self.selected_tool == constants.TOOL_SELECT_CHICKENS: 830 if not (mods & KMOD_CTRL) and self.selected_tool == constants.TOOL_SELECT_CHICKENS:
831 pygame.mouse.set_cursor(*cursors.cursors['select']) 831 pygame.mouse.set_cursor(*cursors.cursors['select'])
832 return False 832 return False
833 833
834 def restore_selection(self, selection): 834 def restore_selection(self, selection):
835 self.unselect_all() 835 self.unselect_all()