Check entities against collides-p

Shirakumo · Jul 7, 2019 · b1b8e10 · b1b8e10
1 parent c845845
commit b1b8e10
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/chunk.lisp b/chunk.lisp
@@ -301,9 +301,11 @@ void main(){
       (when (and (not (eq entity target))
                  (typep entity 'solid))
         (let ((hit (scan entity target)))
-          (when (and hit (or (null result)
-                             (< (vsqrdist2 pos (hit-location hit))
-                                (vsqrdist2 pos (hit-location result)))))
+          (when (and hit
+                     (collides-p target entity hit)
+                     (or (null result)
+                         (< (vsqrdist2 pos (hit-location hit))
+                            (vsqrdist2 pos (hit-location result)))))
             (setf result hit)))))
     (when result
       (collide target (hit-object result) result)