[aisleriot] labyrinth: Use hint-move instead of get-name.



commit 66b7e67880eade458b95c2fcad8b7177c93179ef
Author: Vincent Povirk <madewokherd gmail com>
Date:   Mon May 28 12:20:04 2012 -0500

    labyrinth: Use hint-move instead of get-name.
    
    For bug 551859.

 games/labyrinth.scm |   58 ++++++++++++++++++++++-----------------------------
 1 files changed, 25 insertions(+), 33 deletions(-)
---
diff --git a/games/labyrinth.scm b/games/labyrinth.scm
index 5fbe1d1..5ac4715 100644
--- a/games/labyrinth.scm
+++ b/games/labyrinth.scm
@@ -24,35 +24,35 @@
   (set! DECK (make-deck-list-ace-low 2 2 club))
   (shuffle-deck)
 
-  (add-normal-slot DECK)
+  (add-normal-slot DECK 'stock)
   (add-blank-slot)
-  (add-normal-slot '())
-  (add-normal-slot '())
-  (add-normal-slot '())
-  (add-normal-slot '())
+  (add-normal-slot '() 'foundation)
+  (add-normal-slot '() 'foundation)
+  (add-normal-slot '() 'foundation)
+  (add-normal-slot '() 'foundation)
   (add-carriage-return-slot)
 
-  (add-normal-slot '())
-  (add-normal-slot '())
-  (add-normal-slot '())
-  (add-normal-slot '())
-  (add-normal-slot '())
-  (add-normal-slot '())
-  (add-normal-slot '())
-  (add-normal-slot '())
+  (add-normal-slot '() 'tableau)
+  (add-normal-slot '() 'tableau)
+  (add-normal-slot '() 'tableau)
+  (add-normal-slot '() 'tableau)
+  (add-normal-slot '() 'tableau)
+  (add-normal-slot '() 'tableau)
+  (add-normal-slot '() 'tableau)
+  (add-normal-slot '() 'tableau)
 
   (add-carriage-return-slot)
 
   (set! VERTPOS (- VERTPOS (/ 2 3)))
 
-  (add-extended-slot '() down)
-  (add-extended-slot '() down)
-  (add-extended-slot '() down)
-  (add-extended-slot '() down)
-  (add-extended-slot '() down)
-  (add-extended-slot '() down)
-  (add-extended-slot '() down)
-  (add-extended-slot '() down)
+  (add-extended-slot '() down 'tableau)
+  (add-extended-slot '() down 'tableau)
+  (add-extended-slot '() down 'tableau)
+  (add-extended-slot '() down 'tableau)
+  (add-extended-slot '() down 'tableau)
+  (add-extended-slot '() down 'tableau)
+  (add-extended-slot '() down 'tableau)
+  (add-extended-slot '() down 'tableau)
 
   
   (add-card! 1 (make-visible (make-card ace club)))
@@ -169,27 +169,19 @@
 	((and (= (get-suit (get-top-card slot)) club)
 	      (= (get-value (get-top-card slot))
 		 (+ 1 (get-value (get-top-card 1)))))
-	 (list 1 
-	       (get-name (get-top-card slot))
-	       (get-name (get-top-card 1))))
+	 (hint-move slot 1 1))
 	((and (= (get-suit (get-top-card slot)) diamond)
 	      (= (get-value (get-top-card slot))
 		 (+ 1 (get-value (get-top-card 2)))))
-	 (list 1 
-	       (get-name (get-top-card slot))
-	       (get-name (get-top-card 2))))
+	 (hint-move slot 1 2))
 	((and (= (get-suit (get-top-card slot)) heart)
 	      (= (get-value (get-top-card slot))
 		 (+ 1 (get-value (get-top-card 3)))))
-	 (list 1 
-	       (get-name (get-top-card slot))
-	       (get-name (get-top-card 3))))
+	 (hint-move slot 1 3))
 	((and (= (get-suit (get-top-card slot)) spade)
 	      (= (get-value (get-top-card slot))
 		 (+ 1 (get-value (get-top-card 4)))))
-	 (list 1 
-	       (get-name (get-top-card slot))
-	       (get-name (get-top-card 4))))
+	 (hint-move slot 1 4))
 	(#t (check-slot (+ 1 slot)))))
 
 (define (dealable?)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]