branch: elpa/pacmacs
commit e85c81b077997d97f94e5cbb43e7f3496aa7739c
Author: rexim <[email protected]>
Commit: rexim <[email protected]>
Enable entire code base for coverage (#70)
---
pacmacs.el | 31 ++++++++++++++++---------------
test/test-helper.el | 4 +---
2 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/pacmacs.el b/pacmacs.el
index c75260922f..9c7afb5919 100644
--- a/pacmacs.el
+++ b/pacmacs.el
@@ -66,17 +66,6 @@
(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)
@@ -88,8 +77,6 @@
(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 +125,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)
@@ -406,8 +405,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")