gnome-games r8681 - trunk/aisleriot/rules

[vpovirk svn gnome org]

Author: vpovirk
Date: Sat Feb  7 23:19:39 2009
New Revision: 8681
URL: http://svn.gnome.org/viewvc/gnome-games?rev=8681&view=rev

Log:
aisleriot/rules/scuffle.scm: always reshuffle the deck properly

The button-clicked code in scuffle doesn't account for the fact that
flip-deck returns false when the "waste" pile is empty. If a reserve
pile is empty, it stops, instead of continuing and reshuffling the deck
as it should. The fix is to ignore the return value of flip-deck.


Modified:
   trunk/aisleriot/rules/scuffle.scm

Modified: trunk/aisleriot/rules/scuffle.scm
==============================================================================
--- trunk/aisleriot/rules/scuffle.scm	(original)
+++ trunk/aisleriot/rules/scuffle.scm	Sat Feb  7 23:19:39 2009
@@ -88,11 +88,12 @@
 		(deal-cards-out 5))
 	   (and (< FLIP-COUNTER 2)
 		(set! FLIP-COUNTER (+ 1 FLIP-COUNTER))
-		(flip-deck 0 5)
-		(flip-deck 0 6)
-		(flip-deck 0 7)
-		(flip-deck 0 8)
-		(shuffle-deck)))))
+		(begin
+		  (flip-deck 0 5)
+		  (flip-deck 0 6)
+		  (flip-deck 0 7)
+		  (flip-deck 0 8)
+		  (shuffle-deck))))))
 
 (define (check-end-slot? slot1 slot2)
   (if (and (not (empty-slot? slot1))