Let player crash into _the_ van

1 files changed, 15 insertions, 3 deletions

diff --git a/turbo.scm b/turbo.scm
index 4a569a7..3d70b5d 100644
--- a/turbo.scm
+++ b/turbo.scm
@@ -105,6 +105,14 @@
       (off-road-player-top)
       (off-road-player-bottom)))
 
+(define (vehicle-hitbox vehicle-pos)
+  (rect (vec2-x vehicle-pos) (vec2-y vehicle-pos) vehicle-length vehicle-height))
+
+(define (player-collides?)
+  (let ((player-hitbox (vehicle-hitbox player-position))
+	(van-hitbox (vehicle-hitbox red-van-position)))
+    (rect-intersects? player-hitbox van-hitbox)))
+
 ;;;; Chickadee hooks
 
 (if music-play?
@@ -118,6 +126,12 @@
 	      (off-road-player)
 	      (set! game-over #t)))
 
+	(if (player-collides?)
+	    (begin
+	      (off-road-player)
+	      ;; TODO: Think of different animation for this game over
+	      (set! game-over #t)))
+
 	(set! road-section-position
 	      (if (< road-section-position (* lane-length -1))
 		  (- (+ road-section-position lane-length) player-speed)
@@ -130,9 +144,7 @@
 
 	;; when van goes off screen
 	(if (>= (* vehicle-length -1) (vec2-x red-van-position))
-	    (set! red-van-position (calculate-red-van-position 3)))
-	)
-      ))
+	    (set! red-van-position (calculate-red-van-position 3))))))
 
 (define (draw alpha)
   (draw-road road-section-position road-start-y road-num-lanes)