gnome-games r7714 - trunk/aisleriot/rules

[chpe svn gnome org]

Author: chpe
Date: Wed Jun 18 20:50:09 2008
New Revision: 7714
URL: http://svn.gnome.org/viewvc/gnome-games?rev=7714&view=rev

Log:
Implement dealable? for thumb_and_pouch. Bug #445955


Modified:
   trunk/aisleriot/rules/thumb_and_pouch.scm

Modified: trunk/aisleriot/rules/thumb_and_pouch.scm
==============================================================================
--- trunk/aisleriot/rules/thumb_and_pouch.scm	(original)
+++ trunk/aisleriot/rules/thumb_and_pouch.scm	Wed Jun 18 20:50:09 2008
@@ -136,6 +136,13 @@
 		(remove-card slot-id)
 		(complete-transaction slot-id (list card) end-slot))))))
 
+(define (do-deal-next-cards)
+  (flip-stock 0 1 2)
+  (give-status-message))
+
+(define (dealable?)
+  (flippable? 0 2))
+
 (define (game-continuable)
   (get-hint))
 
@@ -145,13 +152,6 @@
        (= 13 (length (get-cards 4)))
        (= 13 (length (get-cards 5)))))
 
-(define (dealable?)
-  (or (and (not (empty-slot? 0))
-	   (list 0 (_"Deal another round")))
-      (and (not (empty-slot? 1))
-	   (< FLIP-COUNTER 2)
-	   (list 0 (_"Move waste back to stock")))))
-
 (define (empty-exist? slot-id)
   (cond ((= slot-id 13)
 	 #f)
@@ -256,7 +256,11 @@
   (or (check-to-foundations 1)
       (check-to-tableau 6)
       (check-empty?)
-      (dealable?)))
+      (or (and (not (empty-slot? 0))
+               (list 0 (_"Deal another round")))
+          (and (not (empty-slot? 1))
+               (< FLIP-COUNTER 2)
+               (list 0 (_"Move waste back to stock"))))))
 
 (define (get-options) 
   #f)
@@ -267,8 +271,8 @@
 (define (timeout) 
   #f)
 
-(set-features droppable-feature)
+(set-features droppable-feature dealable-feature)
 
 (set-lambda new-game button-pressed button-released button-clicked
 button-double-clicked game-continuable game-won get-hint get-options
-apply-options timeout droppable?)
+apply-options timeout droppable? dealable?)