[nongnu] elpa/pacmacs 6f174d6239 156/472: Access resources in more general way (#95)

[ELPA Syncer]

branch: elpa/pacmacs
commit 6f174d623911b5eb8d1409378a497a1fb72c9126
Author: rexim <reximkut@gmail.com>
Commit: rexim <reximkut@gmail.com>

    Access resources in more general way (#95)
---
 pacmacs-anim.el  | 6 ++++--
 pacmacs-image.el | 3 +--
 pacmacs-utils.el | 5 +++++
 pacmacs.el       | 9 +++++++--
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/pacmacs-anim.el b/pacmacs-anim.el
index e33f7dcf83..007837fbd1 100644
--- a/pacmacs-anim.el
+++ b/pacmacs-anim.el
@@ -49,8 +49,10 @@
         :duration duration))
 
 (defun pacmacs-load-anim (animation-name)
-  (let* ((aseprite-json-file (format "sprites/%s.json" animation-name))
-         (sprite-sheet-file (format "sprites/%s.xpm" animation-name))
+  (let* ((aseprite-json-file (pacmacs--find-resource-file
+                              (format "sprites/%s.json" animation-name)))
+         (sprite-sheet-file (pacmacs--find-resource-file
+                             (format "sprites/%s.xpm" animation-name)))
          (aseprite-json (json-read-file aseprite-json-file))
          (aseprite-frames (cdr (assoc 'frames aseprite-json)))
          (sprite-sheet (pacmacs-load-image sprite-sheet-file)))
diff --git a/pacmacs-image.el b/pacmacs-image.el
index b2d3f69f08..be0d5fdbd5 100644
--- a/pacmacs-image.el
+++ b/pacmacs-image.el
@@ -33,8 +33,7 @@
 ;;; Code:
 
 (defun pacmacs-load-image (filename)
-  (create-image (concat default-directory filename)
-                'xpm nil :heuristic-mask t))
+  (create-image filename 'xpm nil :heuristic-mask t))
 
 (defun pacmacs-insert-image (resource resource-vector)
   (insert-image resource " " nil resource-vector))
diff --git a/pacmacs-utils.el b/pacmacs-utils.el
index ad5b31aa2a..19fb56a68a 100644
--- a/pacmacs-utils.el
+++ b/pacmacs-utils.el
@@ -32,6 +32,8 @@
 
 ;;; Code:
 
+(defconst pacmacs--base (file-name-directory load-file-name))
+
 (defmacro plist-bind (keys expr &rest body)
   (declare (indent 2) (debug (sexp form &rest form)))
   (let ((expr-name (gensym)))
@@ -50,6 +52,9 @@ side-effects."
     (plist-put plist property
                (funcall transformer value))))
 
+(defun pacmacs--find-resource-file (filename)
+  (expand-file-name filename pacmacs--base))
+
 (defun pacmacs--direction-vector (direction)
   (let ((direction-table (list 'left  (cons  0 -1)
                                'right (cons  0  1)
diff --git a/pacmacs.el b/pacmacs.el
index 057a0aea6b..e16b9a36bb 100644
--- a/pacmacs.el
+++ b/pacmacs.el
@@ -42,6 +42,7 @@
 (require 'pacmacs-image)
 (require 'pacmacs-utils)
 (require 'pacmacs-render)
+(require 'pacmacs-score)
 
 (defconst pacmacs-buffer-name "*Pacmacs*")
 (defconst pacmacs-tick-duration-ms 100)
@@ -457,14 +458,18 @@
     (pacmacs--switch-direction pacmacs-player-state 'right)))
 
 (defun pacmacs--get-list-of-levels ()
-  (->> (directory-files "./maps/")
+  (->> (directory-files (pacmacs--find-resource-file "./maps/"))
        (-map #'pacmacs--levelname-from-filename)
        (-remove #'null)
        (-sort #'string-lessp)
        (apply #'vector)))
 
 (defun pacmacs-load-map (map-name)
-  (let* ((lines (split-string (pacmacs--file-content (format "maps/%s.txt" 
map-name)) "\n" t))
+  (let* ((lines (split-string (->> map-name
+                                   (format "./maps/%s.txt")
+                                   (pacmacs--find-resource-file)
+                                   (pacmacs--file-content))
+                              "\n" t))
          (board-width (apply 'max (mapcar #'length lines)))
          (board-height (length lines)))
     (setq pacmacs-board-width board-width)