[nongnu] elpa/pacmacs b68e557f36 064/472: Refactor pacman-load-anim function. Close #53

[ELPA Syncer]

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

    Refactor pacman-load-anim function. Close #53
---
 pacman-anim.el           |  6 ++++--
 pacman.el                | 15 +++++----------
 test/pacman-anim-test.el |  2 +-
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/pacman-anim.el b/pacman-anim.el
index 4fe3b118e4..2664380ccc 100644
--- a/pacman-anim.el
+++ b/pacman-anim.el
@@ -41,8 +41,10 @@
         :current-frame 0
         :sprite-sheet sprite-sheet))
 
-(defun pacman-load-anim (aseprite-json-file sprite-sheet-file)
-  (let* ((aseprite-json (json-read-file aseprite-json-file))
+(defun pacman-load-anim (animation-name)
+  (let* ((aseprite-json-file (format "sprites/%s.json" animation-name))
+         (sprite-sheet-file (format "sprites/%s.xpm" animation-name))
+         (aseprite-json (json-read-file aseprite-json-file))
          (aseprite-frames (cdr (assoc 'frames aseprite-json)))
          (sprite-sheet (pacman-load-image sprite-sheet-file)))
     (pacman-make-anim
diff --git a/pacman.el b/pacman.el
index 2ddfbeec99..695ffd4eb3 100644
--- a/pacman.el
+++ b/pacman.el
@@ -53,20 +53,15 @@
         'up    (cons 0 -1)
         'down  (cons 0 1)))
 (defvar pacman-direction-animation-table
-  (list 'left  (pacman-load-anim "sprites/Pacman-Chomping-Left.json"
-                                 "sprites/Pacman-Chomping-Left.xpm")
-        'right (pacman-load-anim "sprites/Pacman-Chomping-Right.json"
-                                 "sprites/Pacman-Chomping-Right.xpm")
-        'up    (pacman-load-anim "sprites/Pacman-Chomping-Up.json"
-                                 "sprites/Pacman-Chomping-Up.xpm")
-        'down  (pacman-load-anim "sprites/Pacman-Chomping-Down.json"
-                                 "sprites/Pacman-Chomping-Down.xpm")))
+  (list 'left  (pacman-load-anim "Pacman-Chomping-Left")
+        'right (pacman-load-anim "Pacman-Chomping-Right")
+        'up    (pacman-load-anim "Pacman-Chomping-Up")
+        'down  (pacman-load-anim "Pacman-Chomping-Down")))
 (setq pacman-player-state
       (list :row 0
             :column 0
             :direction 'right
-            :animation (pacman-load-anim "sprites/Pacman-Chomping-Right.json"
-                                         "sprites/Pacman-Chomping-Right.xpm")))
+            :animation (pacman-load-anim "Pacman-Chomping-Right")))
 (defvar pacman-empty-cell nil)
 (setq pacman-empty-cell
       (list :animation
diff --git a/test/pacman-anim-test.el b/test/pacman-anim-test.el
index c82dc1b6aa..c69c007fbf 100644
--- a/test/pacman-anim-test.el
+++ b/test/pacman-anim-test.el
@@ -86,4 +86,4 @@
      (mock (json-read-file *) => input-aseprite-format)
      (mock (pacman-load-image *) => input-sprite-sheet)
      (should (equal expected-output
-                    (pacman-load-anim "foo" "bar"))))))
+                    (pacman-load-anim "foo"))))))