Corrected sprite-name substitutions.

Pascal J. Bourguignon [2015-10-31 09:29]
Corrected sprite-name substitutions.
Filename
common-lisp/picture/picture.lisp
diff --git a/common-lisp/picture/picture.lisp b/common-lisp/picture/picture.lisp
index 7bd2917..846e1c6 100644
--- a/common-lisp/picture/picture.lisp
+++ b/common-lisp/picture/picture.lisp
@@ -607,8 +607,10 @@ RETURN: SELF
      (set-sprite-data self
                       (mapcar (lambda (frame) (split-string frame *new-line*))
                               sprite-data)))
-    ((and (consp sprite-data) (consp (car sprite-data)) (or (stringp (caar sprite-data))
-                                                            (consp (caar sprite-data))))
+    ((and (consp sprite-data)
+          (consp (car sprite-data))
+          (or (stringp (caar sprite-data))
+              (consp (caar sprite-data))))
      (let ((new-data
              (make-array
               (list (length sprite-data)
@@ -640,7 +642,7 @@ RETURN: SELF
                                   ((stringp cur-char) (aref cur-char 0))
                                   ((numberp cur-char) (code-char cur-char))
                                   ((symbolp cur-char)
-                                   (aref (symbol-sprite-name cur-char) 0))
+                                   (aref (sprite-name cur-char) 0))
                                   (t (error "~S is not a character!" cur-char))
                                   )))
                      (loop for x from 0 below (array-dimension new-data 2)
@@ -653,7 +655,7 @@ RETURN: SELF
                                       ((stringp cur-char) (aref cur-char 0))
                                       ((numberp cur-char) (code-char cur-char))
                                       ((symbolp cur-char)
-                                       (aref (symbol-sprite-name cur-char) 0))
+                                       (aref (sprite-name cur-char) 0))
                                       (t (error "~S is not a character!"
                                                 cur-char))
                                       ))))))
ViewGit