[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/play/tetris.el
From: |
Sam Steingold |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/play/tetris.el |
Date: |
Sun, 03 Mar 2002 11:09:29 -0500 |
Index: emacs/lisp/play/tetris.el
diff -c emacs/lisp/play/tetris.el:1.6 emacs/lisp/play/tetris.el:1.7
*** emacs/lisp/play/tetris.el:1.6 Sun Mar 3 09:17:41 2002
--- emacs/lisp/play/tetris.el Sun Mar 3 11:09:28 2002
***************
*** 85,94 ****
"Shape 4" "Shape 5" "Shape 6" "Shape 7"))
(result `(vector (const nil))))
(while names
! (add-to-list 'result
! (cons 'choice
! (cons :tag
! (cons (car names)
(mapcar (lambda (color)
(list 'const color))
(defined-colors)))))
--- 85,94 ----
"Shape 4" "Shape 5" "Shape 6" "Shape 7"))
(result `(vector (const nil))))
(while names
! (add-to-list 'result
! (cons 'choice
! (cons :tag
! (cons (car names)
(mapcar (lambda (color)
(list 'const color))
(defined-colors)))))
***************
*** 151,159 ****
"Y position of score.")
;; It is not safe to put this in /tmp.
! ;; Someone could make a symlink in /tmp
;; pointing to a file you don't want to clobber.
! (defvar tetris-score-file "~/.tetris-scores")
;; anybody with a well-connected server want to host this?
;(defvar tetris-score-file "/address@hidden:/pub/cgw/tetris-scores"
"File for holding high scores.")
--- 151,159 ----
"Y position of score.")
;; It is not safe to put this in /tmp.
! ;; Someone could make a symlink in /tmp
;; pointing to a file you don't want to clobber.
! (defvar tetris-score-file "~/.tetris-scores"
;; anybody with a well-connected server want to host this?
;(defvar tetris-score-file "/address@hidden:/pub/cgw/tetris-scores"
"File for holding high scores.")
***************
*** 235,244 ****
[[0 0 0 0] [7 0 0 0] [0 0 0 0] [7 0 0 0]]
[[0 0 0 0] [7 0 0 0] [0 0 0 0] [7 0 0 0]]]])
! ;;the scoring rules were taken from "xtetris". Blocks score differently
;;depending on their rotation
! (defconst tetris-shape-scores
[ [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]] )
(defconst tetris-shape-dimensions
--- 235,244 ----
[[0 0 0 0] [7 0 0 0] [0 0 0 0] [7 0 0 0]]
[[0 0 0 0] [7 0 0 0] [0 0 0 0] [7 0 0 0]]]])
! ;;the scoring rules were taken from "xtetris". Blocks score differently
;;depending on their rotation
! (defconst tetris-shape-scores
[ [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]] )
(defconst tetris-shape-dimensions
***************
*** 491,497 ****
(tetris-shift-down)
(setq tetris-n-shapes (1+ tetris-n-shapes))
(setq tetris-score
! (+ tetris-score
(aref (aref tetris-shape-scores tetris-shape) tetris-rot)))
(tetris-update-score)
(tetris-new-shape))
--- 491,497 ----
(tetris-shift-down)
(setq tetris-n-shapes (1+ tetris-n-shapes))
(setq tetris-score
! (+ tetris-score
(aref (aref tetris-shape-scores tetris-shape) tetris-rot)))
(tetris-update-score)
(tetris-new-shape))