aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Steingold2002-03-03 16:09:28 +0000
committerSam Steingold2002-03-03 16:09:28 +0000
commitadcce7d5f5c2323ff8d56fb12841bab6b541170d (patch)
tree67277c63366b07ef7f1d44a653566e807b735cb7
parent9caf26fececfca2072b59e6a1cc2a431155364d7 (diff)
downloademacs-adcce7d5f5c2323ff8d56fb12841bab6b541170d.tar.gz
emacs-adcce7d5f5c2323ff8d56fb12841bab6b541170d.zip
fixed parens in the last patch
-rw-r--r--lisp/ChangeLog8
-rw-r--r--lisp/play/snake.el4
-rw-r--r--lisp/play/tetris.el18
3 files changed, 18 insertions, 12 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f0a878aa946..db8d0bb1f68 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,10 +1,16 @@
12002-03-03 Sam Steingold <sds@gnu.org>
2
3 * play/snake.el (snake-score-file): Fixed parens (broken by the
4 last patch).
5 * play/tetris.el (tetris-score-file): Ditto.
6
12002-03-03 Richard M. Stallman <rms@gnu.org> 72002-03-03 Richard M. Stallman <rms@gnu.org>
2 8
3 * play/tetris.el (tetris-score-file): Put in home dir, not in /tmp. 9 * play/tetris.el (tetris-score-file): Put in home dir, not in /tmp.
4 10
5 * play/snake.el (snake-score-file): Put in home dir, not in /tmp. 11 * play/snake.el (snake-score-file): Put in home dir, not in /tmp.
6 12
7 * play/gamegrid.el (gamegrid-set-font, gamegrid-setup-face) 13 * play/gamegrid.el (gamegrid-set-font, gamegrid-setup-face)
8 (gamegrid-make-mono-tty-face): Fix usage of condition-case. 14 (gamegrid-make-mono-tty-face): Fix usage of condition-case.
9 15
102002-03-03 Thien-Thi Nguyen <ttn@gnu.org> 162002-03-03 Thien-Thi Nguyen <ttn@gnu.org>
diff --git a/lisp/play/snake.el b/lisp/play/snake.el
index d99d342906b..b2413910a6f 100644
--- a/lisp/play/snake.el
+++ b/lisp/play/snake.el
@@ -83,9 +83,9 @@
83 "Y position of score.") 83 "Y position of score.")
84 84
85;; It is not safe to put this in /tmp. 85;; It is not safe to put this in /tmp.
86;; Someone could make a symlink in /tmp 86;; Someone could make a symlink in /tmp
87;; pointing to a file you don't want to clobber. 87;; pointing to a file you don't want to clobber.
88(defvar snake-score-file "~/.snake-scores") 88(defvar snake-score-file "~/.snake-scores"
89 "File for holding high scores.") 89 "File for holding high scores.")
90 90
91;; ;;;;;;;;;;;;; display options ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 91;; ;;;;;;;;;;;;; display options ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/lisp/play/tetris.el b/lisp/play/tetris.el
index e0bd3f99aa8..778d1ba6933 100644
--- a/lisp/play/tetris.el
+++ b/lisp/play/tetris.el
@@ -85,10 +85,10 @@ Element 0 is ignored."
85 "Shape 4" "Shape 5" "Shape 6" "Shape 7")) 85 "Shape 4" "Shape 5" "Shape 6" "Shape 7"))
86 (result `(vector (const nil)))) 86 (result `(vector (const nil))))
87 (while names 87 (while names
88 (add-to-list 'result 88 (add-to-list 'result
89 (cons 'choice 89 (cons 'choice
90 (cons :tag 90 (cons :tag
91 (cons (car names) 91 (cons (car names)
92 (mapcar (lambda (color) 92 (mapcar (lambda (color)
93 (list 'const color)) 93 (list 'const color))
94 (defined-colors))))) 94 (defined-colors)))))
@@ -151,9 +151,9 @@ Element 0 is ignored."
151 "Y position of score.") 151 "Y position of score.")
152 152
153;; It is not safe to put this in /tmp. 153;; It is not safe to put this in /tmp.
154;; Someone could make a symlink in /tmp 154;; Someone could make a symlink in /tmp
155;; pointing to a file you don't want to clobber. 155;; pointing to a file you don't want to clobber.
156(defvar tetris-score-file "~/.tetris-scores") 156(defvar tetris-score-file "~/.tetris-scores"
157;; anybody with a well-connected server want to host this? 157;; anybody with a well-connected server want to host this?
158;(defvar tetris-score-file "/anonymous@ftp.pgt.com:/pub/cgw/tetris-scores" 158;(defvar tetris-score-file "/anonymous@ftp.pgt.com:/pub/cgw/tetris-scores"
159 "File for holding high scores.") 159 "File for holding high scores.")
@@ -235,10 +235,10 @@ Element 0 is ignored."
235 [[0 0 0 0] [7 0 0 0] [0 0 0 0] [7 0 0 0]] 235 [[0 0 0 0] [7 0 0 0] [0 0 0 0] [7 0 0 0]]
236 [[0 0 0 0] [7 0 0 0] [0 0 0 0] [7 0 0 0]]]]) 236 [[0 0 0 0] [7 0 0 0] [0 0 0 0] [7 0 0 0]]]])
237 237
238;;the scoring rules were taken from "xtetris". Blocks score differently 238;;the scoring rules were taken from "xtetris". Blocks score differently
239;;depending on their rotation 239;;depending on their rotation
240 240
241(defconst tetris-shape-scores 241(defconst tetris-shape-scores
242 [ [6 6 6 6] [6 7 6 7] [6 7 6 7] [6 7 6 7] [6 7 6 7] [5 5 6 5] [5 8 5 8]] ) 242 [ [6 6 6 6] [6 7 6 7] [6 7 6 7] [6 7 6 7] [6 7 6 7] [5 5 6 5] [5 8 5 8]] )
243 243
244(defconst tetris-shape-dimensions 244(defconst tetris-shape-dimensions
@@ -491,7 +491,7 @@ Element 0 is ignored."
491 (tetris-shift-down) 491 (tetris-shift-down)
492 (setq tetris-n-shapes (1+ tetris-n-shapes)) 492 (setq tetris-n-shapes (1+ tetris-n-shapes))
493 (setq tetris-score 493 (setq tetris-score
494 (+ tetris-score 494 (+ tetris-score
495 (aref (aref tetris-shape-scores tetris-shape) tetris-rot))) 495 (aref (aref tetris-shape-scores tetris-shape) tetris-rot)))
496 (tetris-update-score) 496 (tetris-update-score)
497 (tetris-new-shape)) 497 (tetris-new-shape))