X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=gacela_tetris.lisp;h=5435e96bfb8678bb6b651d52dcb6b3ee54a83eb3;hb=6a3d1ffb69036e6d4f1c239fd7d52f9bfc48d50c;hp=82957105659d052ab0932acf1a8701efba6f9d53;hpb=cf93286d937b7f635e9807d7f103807fb5813ca9;p=gacela.git

diff --git a/gacela_tetris.lisp b/gacela_tetris.lisp
index 8295710..5435e96 100644
--- a/gacela_tetris.lisp
+++ b/gacela_tetris.lisp
@@ -1,6 +1,6 @@
 (in-package :gacela)
 
-(set-frames-per-second 15)
+(set-game-properties :title "Gacela Tetris" :fps 15)
 
 (defun tetramine-i ()
   (let ((color '(1 0 0)))
@@ -109,15 +109,28 @@
 
   (defun inc-points (l)
     (incf points
-	  (labels ((more-lines-better 
+	  (labels ((more-lines-better (n)
+				      (cond ((= n 0) n)
+					    (t (+ n (more-lines-better (- n 1)))))))
+		  (* (more-lines-better l) 10)))
     (incf lines l)))
 
 (let ((tetramine (random-tetramine)) (x 6) (y 0)
       (next (random-tetramine))
       (timer (make-timer))
       (grid (make-list 20 :initial-element (make-list 14)))
-      (background (draw-image-function "fondo_tetris.png"))
-      (font (load-font "lazy.ttf" :size 20)))
+      (background (load-texture "fondo_tetris.png"))
+;      (background (load-texture "../../nehe/lesson06/data/nehe.bmp"))
+      (font (load-font "lazy.ttf" :size 20))
+      (game-over))
+
+  (defun game ()
+    (if game-over (game-over) (tetramine)))
+
+  (defun game-over ()
+    (translate -100 0)
+    (render-text "Game Over" font :size 50))
+
   (defun tetramine ()
     (cond ((eq (timer-state timer) 'stopped) (start-timer timer)))
 
@@ -140,9 +153,10 @@
 		      (> (+ y 1 (length tetramine)) 20))
 		  (setq grid (remove-rows-completed (join-grids tetramine grid x y)))
 		  (setq tetramine next x 6 y 0)
+		  (cond ((collide-grids tetramine grid x y) (setq game-over t)))
 		  (setq next (random-tetramine)))
 		 (t (incf y) (start-timer timer)))))
-    (funcall background)
+    (draw-texture background)
     (translate -288 218)
     (draw-grid (join-grids tetramine grid x y))
     (translate 440 440)
@@ -155,7 +169,8 @@
 (let ((frame 0.0) (fps (make-timer)) (update (make-timer)))
   (start-timer update)
   (start-timer fps)
-  (run-game "Gacela Tetris"
-	    (tetramine)
-	    (incf frame)
-	    (cond ((> (get-time update) 1000) (print (/ frame (/ (get-time fps) 1000.0))) (start-timer update)))))
+  (run-game
+   (game)
+   (incf frame)
+   (cond ((> (get-time update) 1000) (print (/ frame (/ (get-time fps) 1000.0))) (start-timer update))))
+  (quit-game))