[elpa] externals/mines 0fb75df 16/43: * mines.el (mines-set-numbers): Use mines-matrix-2-index

[Stefan Monnier]

branch: externals/mines
commit 0fb75df6903a5f6535dce17575eba53588140eb5
Author: Tino Calancha <tino.calancha@gmail.com>
Commit: Tino Calancha <tino.calancha@gmail.com>

    * mines.el (mines-set-numbers): Use mines-matrix-2-index
---
 mines.el | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/mines.el b/mines.el
index 0039ed4..dc9f702 100644
--- a/mines.el
+++ b/mines.el
@@ -282,35 +282,35 @@ If `custom' then ask user for these numbers."
   (let ((tmp-grid (copy-sequence mines-grid)))
     (dotimes (i mines-number-rows)
       (dotimes (j mines-number-cols)
-        (let ((idx (+ (* i mines-number-cols) j))
+        (let ((idx (mines-matrix-2-index i j))
               (numb 0))
           (unless (aref mines-grid idx)
             ;; Horizontal neighbours.
             (when (> j 0)
-              (let ((tmp-idx (+ (* i mines-number-cols) (1- j))))
+              (let ((tmp-idx (mines-matrix-2-index i (1- j))))
                 (and (aref mines-grid tmp-idx) (cl-incf numb))))
             (when (< j (1- mines-number-cols))
-              (let ((tmp-idx (+ (* i mines-number-cols) (1+ j))))
+              (let ((tmp-idx (mines-matrix-2-index i (1+ j))))
                 (and (aref mines-grid tmp-idx) (cl-incf numb))))
             ;; Previous row neighbours.
             (when (> i 0)
-              (let ((tmp-idx (+ (* (1- i) mines-number-cols) j)))
+              (let ((tmp-idx (mines-matrix-2-index (1- i) j)))
                 (and (aref mines-grid tmp-idx) (cl-incf numb)))
               (when (> j 0)
-                (let ((tmp-idx (+ (* (1- i) mines-number-cols) (1- j))))
+                (let ((tmp-idx (mines-matrix-2-index (1- i) (1- j))))
                   (and (aref mines-grid tmp-idx) (cl-incf numb))))
               (when (< j (1- mines-number-cols))
-                (let ((tmp-idx (+ (* (1- i) mines-number-cols) (1+ j))))
+                (let ((tmp-idx (mines-matrix-2-index (1- i) (1+ j))))
                   (and (aref mines-grid tmp-idx) (cl-incf numb)))))
             ;; Next row neighbours.
             (when (< i (1- mines-number-rows))
-              (let ((tmp-idx (+ (* (1+ i) mines-number-cols) j)))
+              (let ((tmp-idx (mines-matrix-2-index (1+ i) j)))
                 (and (aref mines-grid tmp-idx) (cl-incf numb)))
               (when (> j 0)
-                (let ((tmp-idx (+ (* (1+ i) mines-number-cols) (1- j))))
+                (let ((tmp-idx (mines-matrix-2-index (1+ i) (1- j))))
                   (and (aref mines-grid tmp-idx) (cl-incf numb))))
               (when (< j (1- mines-number-cols))
-                (let ((tmp-idx (+ (* (1+ i) mines-number-cols) (1+ j))))
+                (let ((tmp-idx (mines-matrix-2-index (1+ i) (1+ j))))
                   (and (aref mines-grid tmp-idx) (cl-incf numb)))))
             ;; Update `mines-grid'.
             (unless (zerop numb)