diff options
Diffstat (limited to 'game.scm')
| -rw-r--r-- | game.scm | 15 |
1 files changed, 5 insertions, 10 deletions
@@ -601,7 +601,6 @@ level? (height level-height set-level-height!) (foreground level-foreground set-level-foreground!) - (background level-background set-level-background!) (collision level-collision set-level-collision!) (objects level-objects set-level-objects!)) (define level ,(call-with-input-file "level.scm" read)) @@ -609,7 +608,7 @@ (+ (* level-width y) x)) (define (point-collides-with-level? level x y) (match level - (#('level height foreground background collision objects) + (#('level height foreground collision objects) (let ((tx (trunc (/ x tile-width))) (ty (trunc (/ y tile-height)))) (and (>= tx 0) (< tx level-width) @@ -617,7 +616,7 @@ (= (bytevector-u8-ref collision (level-offset tx ty)) 1)))))) (define (rect-collides-with-level? level x y w h) (match level - (#('level height foreground background collision objects) + (#('level height foreground collision objects) (let* ((y (+ y (- (* height tile-height) game-height *scroll*))) (tx0 (trunc (/ x tile-width))) (ty0 (trunc (/ y tile-height))) @@ -633,7 +632,7 @@ (occupied? tx0 ty1)))))) (define (draw-level-layer level layer parallax) (match level - (#('level height _ _ _ _) + (#('level height _ _ _) (let* ((tw tile-width) (th tile-height) (scroll (* *scroll* parallax)) @@ -656,16 +655,12 @@ tx (- ty pixel-y-offset) tw th))))))))) (define (draw-level-foreground level) (match level - (#('level height foreground background collision objects) + (#('level height foreground collision objects) (draw-level-layer level foreground 1.0)))) - (define (draw-level-background level) - (match level - (#('level height foreground background collision objects) - (draw-level-layer level background 0.75)))) (define max-scroll (- (* (level-height level) tile-height) game-height)) (define (level-update! level) (match level - (#('level height foreground background collision objects) + (#('level height foreground collision objects) (let ((scroll (min (+ *scroll* *scroll-speed*) max-scroll))) (set! *last-scroll* *scroll*) (set! *scroll* scroll) |