gnome-games r8892 - trunk/aisleriot/rules

[vpovirk svn gnome org]

Author: vpovirk
Date: Wed Mar 25 04:44:17 2009
New Revision: 8892
URL: http://svn.gnome.org/viewvc/gnome-games?rev=8892&view=rev

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

This fixes a test failure (see bug 569936).


Modified:
   trunk/aisleriot/rules/cruel.scm

Modified: trunk/aisleriot/rules/cruel.scm
==============================================================================
--- trunk/aisleriot/rules/cruel.scm	(original)
+++ trunk/aisleriot/rules/cruel.scm	Wed Mar 25 04:44:17 2009
@@ -89,7 +89,8 @@
          (= (get-suit(get-top-card end-slot)) (get-suit(car card-list)))
          (= (+ 1 (get-value(get-top-card end-slot))) (get-value(car card-list)))
     )
-    (and (not (empty-slot? end-slot))
+    (and (not (= start-slot end-slot))
+         (not (empty-slot? end-slot))
          (= (get-suit(get-top-card end-slot)) (get-suit(car card-list)))
          (= (- (get-value(get-top-card end-slot)) 1) (get-value(car card-list)))
     )