From b39a6c690d1b090c3a26eac4c49f979651acc111 Mon Sep 17 00:00:00 2001 From: skomoroh Date: Mon, 28 Aug 2006 21:23:52 +0000 Subject: [PATCH] * fixed game Q.C. git-svn-id: file:///home/shlomif/Backup/svn-dumps/PySolFC/svnsync-repos/pysolfc/PySolFC/trunk@60 efabe8c0-fbe8-4139-b769-b5e6d273206e --- pysollib/games/klondike.py | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/pysollib/games/klondike.py b/pysollib/games/klondike.py index 58d1c2ce..155845a5 100644 --- a/pysollib/games/klondike.py +++ b/pysollib/games/klondike.py @@ -899,21 +899,20 @@ class Q_C_(Klondike): return 0 def fillAll(self): - # rows - for r in self.s.rows: - if self.fillOne(r): - self.fillAll() - return - # waste + # fill if not self.s.waste.cards and self.s.talon.cards: self.s.talon.dealCards() - if self.fillOne(self.s.waste): - self.fillAll() - - def fillStack(self, stack): - if stack in self.s.rows: + for stack in self.s.rows: if not stack.cards and self.s.waste.cards: self.s.waste.moveMove(1, stack) + # move to foundations + if self.fillOne(self.s.waste): + self.fillAll() + for stack in self.s.rows: + if self.fillOne(stack): + self.fillAll() + + def fillStack(self, stack): self.fillAll() shallHighlightMatch = Game._shallHighlightMatch_SS