branch: elpa/pacmacs
commit 314809f2a7e66d9cef0d3abdddc8b9fcd26d7c72
Merge: 21a99294ad 9fd3009e5a
Author: rexim <[email protected]>
Commit: rexim <[email protected]>
Merge branch 'master' into feature/awesome-score-sign-203
Need #204 and #206 in feature/awesome-score-sign-203
---
pacmacs.el | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/pacmacs.el b/pacmacs.el
index 536dae30c7..3a39786d6b 100644
--- a/pacmacs.el
+++ b/pacmacs.el
@@ -95,7 +95,7 @@
:type '(radio (const :tag "Default path")
(directory :tag "Custom path")))
-(define-derived-mode pacmacs-mode special-mode "pacmacs-mode"
+(define-derived-mode pacmacs-mode special-mode "Pacmacs"
(define-key pacmacs-mode-map (kbd "<up>") 'pacmacs-up)
(define-key pacmacs-mode-map (kbd "<down>") 'pacmacs-down)
(define-key pacmacs-mode-map (kbd "<left>") 'pacmacs-left)
@@ -106,6 +106,11 @@
(setq cursor-type nil)
(setq truncate-lines t))
+(define-derived-mode pacmacs-game-over-mode special-mode "Pacmacs Game Over"
+ (define-key pacmacs-game-over-mode-map (kbd "q") 'pacmacs-quit)
+ (setq cursor-type nil)
+ (setq truncate-lines t))
+
;;;###autoload
(defun pacmacs-start ()
(interactive)
@@ -589,7 +594,8 @@
(let ((nickname (widget-value widget)))
(pacmacs--add-entry-to-score-table nickname score)
(widget-value-set widget (pacmacs--align-score-record-nickname nickname))
- (widget-delete widget))))
+ (widget-delete widget)
+ (pacmacs-game-over-mode))))
(defun pacmacs--switch-to-game-over-state ()
(pacmacs--load-map-sign "game-over")
@@ -598,6 +604,7 @@
(pacmacs--render-state)
(fundamental-mode)
+ (setq truncate-lines t)
(read-only-mode 0)
(with-current-buffer pacmacs-buffer-name
@@ -623,11 +630,12 @@
(plist-bind ((height :height))
pacmacs--object-board
(goto-char (point-min))
- (forward-line (+ height pacmacs--score-table-render-offset
new-score-position))))
+ (forward-line (+ height pacmacs--score-table-render-offset
new-score-position)))
+ (use-local-map widget-keymap)
+ (widget-setup))
(pacmacs--render-score-table score-table)
- (goto-char (point-min)))
- (use-local-map widget-keymap)
- (widget-setup))))
+ (goto-char (point-min))
+ (pacmacs-game-over-mode)))))
(defun pacmacs--switch-to-play-state ()
(setq pacmacs-game-state 'play)
