[nongnu] elpa/pacmacs 2dac90bc61 092/472: Merge branch 'entire-code-coverage-70'. Close #70

[ELPA Syncer]

branch: elpa/pacmacs
commit 2dac90bc61ab5631b4ecc2359090faa2bf9d97ed
Merge: 3cbd9508d8 e7abee5bd3
Author: rexim <reximkut@gmail.com>
Commit: rexim <reximkut@gmail.com>

    Merge branch 'entire-code-coverage-70'. Close #70
---
 pacmacs.el          | 49 +++++++++++++++++++++++++++----------------------
 test/test-helper.el |  4 +---
 2 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/pacmacs.el b/pacmacs.el
index c75260922f..90ec5badb1 100644
--- a/pacmacs.el
+++ b/pacmacs.el
@@ -66,29 +66,12 @@
             (cons (cons 0 1) 'down)))
 
 (defvar pacmacs-player-state nil)
-(setq pacmacs-player-state
-      (list :row 0
-            :column 0
-            :direction 'right
-            :current-animation (pacmacs-load-anim "Pacman-Chomping-Right")
-            :direction-animations (list 'left  (pacmacs-load-anim 
"Pacman-Chomping-Left")
-                                        'right (pacmacs-load-anim 
"Pacman-Chomping-Right")
-                                        'up    (pacmacs-load-anim 
"Pacman-Chomping-Up")
-                                        'down  (pacmacs-load-anim 
"Pacman-Chomping-Down"))
-            :speed 0
-            :speed-counter 0))
 
 (defvar pacmacs-ghosts nil)
 (defvar pacmacs-wall-cells nil)
 (defvar pacmacs-pills nil)
 
 (defvar pacmacs-empty-cell nil)
-(setq pacmacs-empty-cell
-      (list :current-animation
-            (pacmacs-make-anim (list (pacmacs-make-frame '(0 0 40 40) 100))
-                               (pacmacs-create-transparent-block 40 40))))
-
-
 
 (defvar pacmacs-board nil)
 (defvar pacmacs-track-board nil)
@@ -138,6 +121,18 @@
         :speed 1
         :speed-counter 0))
 
+(defun pacmacs--make-player (row column)
+  (list :row row
+        :column column
+        :direction 'right
+        :current-animation (pacmacs-load-anim "Pacman-Chomping-Right")
+        :direction-animations (list 'left  (pacmacs-load-anim 
"Pacman-Chomping-Left")
+                                    'right (pacmacs-load-anim 
"Pacman-Chomping-Right")
+                                    'up    (pacmacs-load-anim 
"Pacman-Chomping-Up")
+                                    'down  (pacmacs-load-anim 
"Pacman-Chomping-Down"))
+        :speed 0
+        :speed-counter 0))
+
 (defun pacmacs-init-board (width height)
   (let ((board (make-vector height nil)))
     (dotimes (row height)
@@ -185,6 +180,14 @@
     (plist-put game-object :direction direction)
     (plist-put game-object :current-animation (plist-get direction-animations 
direction))))
 
+(defun pacmacs--make-empty-cell ()
+  (if pacmacs-empty-cell
+      pacmacs-empty-cell
+    (setq pacmacs-empty-cell
+          (list :current-animation
+                (pacmacs-make-anim (list (pacmacs-make-frame '(0 0 40 40) 100))
+                                   (pacmacs-create-transparent-block 40 
40))))))
+
 (defun pacmacs-step-object (game-object)
   (plist-bind ((row :row)
                (column :column)
@@ -338,9 +341,9 @@
     (pacmacs-render-track-board))
 
   (pacmacs--fill-board pacmacs-board
-                      pacmacs-board-width
-                      pacmacs-board-height
-                      pacmacs-empty-cell)
+                       pacmacs-board-width
+                       pacmacs-board-height
+                       (pacmacs--make-empty-cell))
 
   (pacmacs-put-object pacmacs-player-state)
 
@@ -406,8 +409,10 @@
                         (add-to-list 'pacmacs-pills (pacmacs--make-pill row 
column)))
 
                        ((char-equal x ?o)
-                        (plist-put pacmacs-player-state :row row)
-                        (plist-put pacmacs-player-state :column column))
+                        (if (not pacmacs-player-state)
+                            (setq pacmacs-player-state (pacmacs--make-player 
row column))
+                          (plist-put pacmacs-player-state :row row)
+                          (plist-put pacmacs-player-state :column column)))
 
                        ((char-equal x ?g)
                         (add-to-list 'pacmacs-ghosts (pacmacs--make-ghost row 
column))))))))
diff --git a/test/test-helper.el b/test/test-helper.el
index 54c94e0a58..0115ca979d 100644
--- a/test/test-helper.el
+++ b/test/test-helper.el
@@ -6,6 +6,4 @@
 (undercover "*.el")
 
 (add-to-list 'load-path ".")
-(load "pacmacs-anim.el")
-(load "pacmacs-image.el")
-(load "pacmacs-utils.el")
+(load "pacmacs.el")