gnome-games r7713 - trunk/aisleriot/rules

[chpe svn gnome org]

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

Log:
Implement dealable? for triple_peaks. Bug #445955


Modified:
   trunk/aisleriot/rules/triple_peaks.scm

Modified: trunk/aisleriot/rules/triple_peaks.scm
==============================================================================
--- trunk/aisleriot/rules/triple_peaks.scm	(original)
+++ trunk/aisleriot/rules/triple_peaks.scm	Wed Jun 18 20:50:08 2008
@@ -298,19 +298,25 @@
        (move-n-cards! start-slot end-slot card-list)
        (tally-score start-slot)))
 
+(define (do-deal-next-cards)
+  (and (flip-deck 1 2)
+       (deal-cards-face-up 0 '(2))
+       (if (not multiplier-scoring)
+           (set-score! (max (- (get-score) 5) 0)))))
+
 (define (button-clicked slot-id)
   (if (= slot-id 0)
       (and (not (empty-slot? 0))
-           (flip-deck 1 2)
-           (deal-cards-face-up 0 '(2))
-           (if (not multiplier-scoring)
-               (set-score! (max (- (get-score) 5) 0))))
+           (do-deal-next-cards))
       (and (> slot-id 2)
            (available? slot-id)
            (movable? (get-top-card slot-id))
            (deal-cards slot-id '(2))
            (tally-score slot-id))))
 
+(define (dealable?)
+  (not (empty-slot? 0)))
+
 (define (button-double-clicked slot-id)
     (button-clicked slot-id))
 
@@ -352,6 +358,6 @@
 (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?)
+(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? dealable?)