aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorGerd Moellmann2000-11-27 13:36:57 +0000
committerGerd Moellmann2000-11-27 13:36:57 +0000
commit26a8d08da569179a52828c2bf321908826e9c633 (patch)
tree9c464cfe694d0e0f7f1ee83e6c8e8662f7829d06 /lisp
parent49060c51af298ac8991bb8acef489a1b4083e038 (diff)
downloademacs-26a8d08da569179a52828c2bf321908826e9c633.tar.gz
emacs-26a8d08da569179a52828c2bf321908826e9c633.zip
Update from author.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/play/5x5.el27
2 files changed, 18 insertions, 13 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bdcdd81585f..10d3413a6d3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12000-11-27 Gerd Moellmann <gerd@gnu.org>
2
3 * play/5x5.el: Update from author.
4
12000-11-27 Andrew Innes <andrewi@gnu.org> 52000-11-27 Andrew Innes <andrewi@gnu.org>
2 6
3 * makefile.nt (.SUFFIXES): Add .SUFFIXES. 7 * makefile.nt (.SUFFIXES): Add .SUFFIXES.
diff --git a/lisp/play/5x5.el b/lisp/play/5x5.el
index 7fb1ff1b346..490beff86cc 100644
--- a/lisp/play/5x5.el
+++ b/lisp/play/5x5.el
@@ -1,11 +1,11 @@
1;;; 5x5.el -- Simple little puzzle game. 1;;; 5x5.el -- Simple little puzzle game.
2 2
3;; Copyright (C) 1999 Free Software Foundation, Inc. 3;; Copyright (C) 1999,2000 Free Software Foundation, Inc.
4 4
5;; Author: Dave Pearson <davep@hagbard.demon.co.uk> 5;; Author: Dave Pearson <davep@davep.org>
6;; Maintainer: Dave Pearson <davep@hagbard.demon.co.uk> 6;; Maintainer: Dave Pearson <davep@davep.org>
7;; Created: 1998-10-03 7;; Created: 1998-10-03
8;; Version: $Revision: 1.2 $ 8;; Version: $Revision: 1.20 $
9;; Keywords: games puzzles 9;; Keywords: games puzzles
10 10
11;; This file is part of GNU Emacs. 11;; This file is part of GNU Emacs.
@@ -414,15 +414,16 @@ should return a grid vector array that is the new solution."
414 "Play a solution on an empty grid. This destroys the current game in 414 "Play a solution on an empty grid. This destroys the current game in
415progress because it is an animated attempt." 415progress because it is an animated attempt."
416 (5x5-new-game) 416 (5x5-new-game)
417 (loop for y from 0 to (1- 5x5-grid-size) do 417 (let ((inhibit-quit t))
418 (loop for x from 0 to (1- 5x5-grid-size) do 418 (loop for y from 0 to (1- 5x5-grid-size) do
419 (setq 5x5-y-pos y 419 (loop for x from 0 to (1- 5x5-grid-size) do
420 5x5-x-pos x) 420 (setq 5x5-y-pos y
421 (if (5x5-cell solution y x) 421 5x5-x-pos x)
422 (5x5-flip-current)) 422 (if (5x5-cell solution y x)
423 (5x5-draw-grid (list 5x5-grid solution best)) 423 (5x5-flip-current))
424 (5x5-position-cursor) 424 (5x5-draw-grid (list 5x5-grid solution best))
425 (sit-for 5x5-animate-delay))) 425 (5x5-position-cursor)
426 (sit-for 5x5-animate-delay))))
426 5x5-grid) 427 5x5-grid)
427 428
428;; Keyboard response functions. 429;; Keyboard response functions.