atoms.lisp: Fix undo/redo action sensitivity.

[atoms] / atoms.lisp

diff --git a/atoms.lisp b/atoms.lisp
index e1c331c..af9a21c 100644 (file)
--- a/atoms.lisp
+++ b/atoms.lisp
@@ -290,11 +290,11 @@
               (state (player-state player)))
          (cond ((and (zerop score) (eql state :playing))
                 (setf (player-state player) :losing))
-               ((member state '(:playing :starting))
+               ((member state '(:playing :starting :ready))
                 (incf remaining)
                 (setf found player)))))
       (changed game :scores :players players)
-      (when (= remaining 1)
+      (when (and (= remaining 1) (>= (length players) 2))
        (setf (player-state found) :winning)
        (changed game :finished :victor found)))))
 
@@ -362,8 +362,8 @@
          (unless (cell-played cell player-index)
            (return-from escape))
          (setf (player-state player) :playing)
-         (perform-explosions game (list cell)))
-       (changed game :processing-move)))))
+         (changed game :processing-move))
+       (perform-explosions game (list cell))))))
 
 (defmethod restart-game ((game atom-game) &key grid players)
   (game-cancel-timeout game)
@@ -416,7 +416,13 @@
          for snap-player in snap-players
          do (restore player snap-player))
     (setf (game-player-index game) (slot-value snapshot 'player-index))
-    (changed game :refresh)))
+    (game-cancel-timeout game)
+    (changed game :refresh)
+    (let ((critical-cells (loop for i below (array-total-size grid)
+                               for cell = (row-major-aref grid i)
+                               if (cell-critical-p cell)
+                               collect cell)))
+      (when critical-cells (perform-explosions game critical-cells)))))
 
 ;;;--------------------------------------------------------------------------
 ;;; The interactive board.
@@ -741,7 +747,7 @@
                                               :step-increment 1))
    (count-adjustment :type gtk:adjustment
                     :initform (make-instance 'gtk:adjustment
-                                             :lower 2 :upper 20
+                                             :lower 1 :upper 20
                                              :step-increment 1))
    (players :type gtk:list-store
            :initform (make-instance 'gtk:list-store
@@ -1004,7 +1010,7 @@
 (defmethod notify progn
     ((window atom-game-window) (game atom-game) aspect &key)
   (case aspect
-    ((:undo :redo :refresh :processing-move)
+    ((:undo :redo :refresh :start-turn)
      (update-undo-redo-sensitivity window))))
 
 (defun action-undo (window)