[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/pacmacs 9fd3009e5a 442/472: Merge pull request #206 from c
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/pacmacs 9fd3009e5a 442/472: Merge pull request #206 from codingteam/bug/quit-game-over-with-q-202 |
Date: |
Thu, 6 Jan 2022 21:59:47 -0500 (EST) |
branch: elpa/pacmacs
commit 9fd3009e5a25dfdb3ff7d97b4ffb0fdde984a520
Merge: fc06a12e07 447882d2ef
Author: Alexey Kutepov <reximkut@gmail.com>
Commit: Alexey Kutepov <reximkut@gmail.com>
Merge pull request #206 from codingteam/bug/quit-game-over-with-q-202
Quit Game Over state with q key
---
pacmacs.el | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/pacmacs.el b/pacmacs.el
index 975ce80fea..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")
@@ -624,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)
- [nongnu] elpa/pacmacs 10705b45c5 376/472: Rename bits-to-xpm to wall-tile-to-xpm (#138), (continued)
- [nongnu] elpa/pacmacs 10705b45c5 376/472: Rename bits-to-xpm to wall-tile-to-xpm (#138), ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs a5583b6255 377/472: Fix wall-tile-to-xpm UT (#138), ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs 93f031ae4e 382/472: Fix create-wall-tile UT (#138), ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs 2c7e23070b 380/472: Fix put-vertical-bar UT (#138), ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs dc14097468 400/472: Add emacs mode for game over (#134), ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs 98816141d5 398/472: Merge pull request #189 from codingteam/remove-make-terrified-ghost, ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs 30442797d3 404/472: Add consts for nick and table sizes (#134), ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs 0eeb82ebc9 425/472: Merge pull request #193 from codingteam/rework-nick-after-death-134, ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs ce1054fab3 433/472: Remove redundant find-resource-file call (#191), ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs 21a99294ad 440/472: Add score sign (#203), ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs 9fd3009e5a 442/472: Merge pull request #206 from codingteam/bug/quit-game-over-with-q-202,
ELPA Syncer <=
- [nongnu] elpa/pacmacs 95cce606fd 024/472: Support for Aseprite animation format. Close #16, ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs 09aa49c6b0 065/472: UTs for pacman-image. Close #52, ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs ee893d28bd 180/472: Add module for recording action (#115), ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs 95c046205a 187/472: Compilation warnings as errors (#123), ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs fe40eb20c7 190/472: Merge branch 'coverage-dropped-124' (#124), ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs 8e36b66a6f 199/472: Make object-board contain list of object (#126), ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs 6b43cde65d 223/472: Add big pill game object (#81), ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs 0546e964b1 222/472: Connected walls proof of concept for #131, ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs 19ffa64f7e 230/472: Merge branch 'master' into connecte-walls, ELPA Syncer, 2022/01/06
- [nongnu] elpa/pacmacs e0856fc881 244/472: Refactor wall tiles functions (#131):, ELPA Syncer, 2022/01/06