branch: elpa/pacmacs
commit 7f980e59a41c6a66794d1dd6f77017a6693e47a9
Author: rexim <[email protected]>
Commit: rexim <[email protected]>
Load game-over sign from signs folder (#191)
---
Cask | 1 +
maps/game-over.txt | 12 ------------
pacmacs.el | 17 +++++++++++++----
3 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/Cask b/Cask
index 9f5be6eb2f..f266b0edf2 100644
--- a/Cask
+++ b/Cask
@@ -5,6 +5,7 @@
(files "*.el"
("maps" "maps/*.txt")
+ ("signs" "signs/*.txt")
("sprites" "sprites/*.json")
("sprites" "sprites/*.xpm"))
diff --git a/maps/game-over.txt b/maps/game-over.txt
deleted file mode 100644
index ee635e1f7c..0000000000
--- a/maps/game-over.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-
- ### ### ##### ###
- # # # # # # #
- # # ### # # # ###
- # # # # # # # #
- ### # # # # # ###
-
- ### # # ### ###
- # # # # # # #
- # # # # ### ####
- # # ### # # #
- ### # ### # #
diff --git a/pacmacs.el b/pacmacs.el
index 1a09a7702d..8e008f0fa8 100644
--- a/pacmacs.el
+++ b/pacmacs.el
@@ -592,7 +592,7 @@
(widget-delete widget))))
(defun pacmacs--switch-to-game-over-state ()
- (pacmacs--load-map "game-over")
+ (pacmacs--load-map-sign "game-over")
(pacmacs-destroy)
(setq pacmacs-game-state 'game-over)
(pacmacs--render-state)
@@ -738,9 +738,18 @@
(pacmacs--possible-diagonal-ways row column)))))
(defun pacmacs--load-map (map-name)
- (let* ((lines (split-string (->> map-name
- (format "%s/%s.txt"
(pacmacs--get-levels-folder))
- (f-read-text))
+ (->> map-name
+ (format "%s/%s.txt" (pacmacs--get-levels-folder))
+ (pacmacs--load-map-file)))
+
+(defun pacmacs--load-map-sign (sign-name)
+ (->> sign-name
+ (format "./signs/%s.txt")
+ (pacmacs--find-resource-file)
+ (pacmacs--load-map-file)))
+
+(defun pacmacs--load-map-file (map-file-name)
+ (let* ((lines (split-string (f-read-text map-file-name)
"\n" t))
(board-width (apply 'max (mapcar #'length lines)))
(board-height (length lines)))
