branch: elpa/pacmacs
commit ed40addf956a940d81873f29c67dc04c7a832716
Author: rexim <[email protected]>
Commit: rexim <[email protected]>
Refactor pacmacs--put-object (#74)
---
pacmacs.el | 4 +---
test/pacmacs-test.el | 14 ++++++++------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/pacmacs.el b/pacmacs.el
index 31ed6f7b22..e2453a8ce3 100644
--- a/pacmacs.el
+++ b/pacmacs.el
@@ -286,9 +286,7 @@
(plist-bind ((row :row)
(column :column))
anim-object
- (when (and (<= 0 row) (<= row (1- pacmacs-board-height))
- (<= 0 column) (<= column (1- pacmacs-board-width)))
- (aset (aref pacmacs-board row) column anim-object))))
+ (pacmacs--cell-set pacmacs-board row column anim-object)))
(defun pacmacs-render-track-board ()
(dotimes (row pacmacs-board-height)
diff --git a/test/pacmacs-test.el b/test/pacmacs-test.el
index a86d1a316d..e27a3af2e1 100644
--- a/test/pacmacs-test.el
+++ b/test/pacmacs-test.el
@@ -33,12 +33,14 @@
(pacmacs--track-object game-object))))
(ert-deftest pacmacs--put-object-test ()
- (let ((pacmacs-board-width 2)
- (pacmacs-board-height 2)
- (pacmacs-board [[nil nil]
- [nil nil]])
+ (let ((pacmacs-board (list :width 2
+ :height 2
+ :data [[nil nil]
+ [nil nil]]))
(anim-object (list :row 0 :column 1)))
(pacmacs--put-object anim-object)
- (should (equal [[nil (:row 0 :column 1)]
- [nil nil]]
+ (should (equal (list :width 2
+ :height 2
+ :data [[nil (:row 0 :column 1)]
+ [nil nil]])
pacmacs-board))))
