gnome-games r9029 - trunk/aisleriot/rules

[vpovirk svn gnome org]

Author: vpovirk
Date: Thu Apr  9 04:32:41 2009
New Revision: 9029
URL: http://svn.gnome.org/viewvc/gnome-games?rev=9029&view=rev

Log:
aisleriot: do not allow no-op drops in Westhaven

This fixes a test failure (see bug 569936).


Modified:
   trunk/aisleriot/rules/westhaven.scm

Modified: trunk/aisleriot/rules/westhaven.scm
==============================================================================
--- trunk/aisleriot/rules/westhaven.scm	(original)
+++ trunk/aisleriot/rules/westhaven.scm	Thu Apr  9 04:32:41 2009
@@ -78,7 +78,8 @@
 					(length card-list)))))))
 
 (define (droppable? start-slot card-list end-slot)
-  (cond ((> end-slot 5)
+  (cond ((= start-slot end-slot) #f)
+        ((> end-slot 5)
 	 (or (empty-slot? end-slot)
 	     (and (not (eq? (is-red? (get-top-card end-slot))
 			    (is-red? (car (reverse card-list)))))