X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=gacela_tetris.lisp;h=ef56ed2faaa53c406bdd4c9e08729fb822cce762;hb=725dbc52d30cf457f98fa4e0e5bf1051da09d1b9;hp=6a0242f6271305034fcbce2460ee677fc381400a;hpb=357aa6f62c04d59385ac4e44a5303d0825aa81ba;p=gacela.git

diff --git a/gacela_tetris.lisp b/gacela_tetris.lisp
index 6a0242f..ef56ed2 100644
--- a/gacela_tetris.lisp
+++ b/gacela_tetris.lisp
@@ -1,5 +1,7 @@
 (in-package :gacela)
 
+(set-frames-per-second 15)
+
 (defun tetramine-i ()
   (let ((color '(1 0 0)))
     `((,color ,color ,color ,color))))
@@ -46,7 +48,7 @@
 
 (defun draw-cell (cell)
   (cond ((null cell) nil)
-	(t (draw-color cell) (draw-square :size 20))))
+	(t (with-color cell (draw-square :size 20)))))
 
 (defun draw-row (row)
   (mapcar (lambda (cell) (draw-cell cell) (translate 23 0)) row))
@@ -101,7 +103,8 @@
       (next (random-tetramine))
       (timer (make-timer))
       (grid (make-list 20 :initial-element (make-list 14)))
-      (background (draw-image-function "fondo_tetris.png")))
+      (background (draw-image-function "fondo_tetris.png"))
+      (font (open-font "lazy.ttf")))
   (defun tetramine ()
     (cond ((eq (timer-state timer) 'stopped) (start-timer timer)))
 
@@ -126,13 +129,12 @@
 		  (setq tetramine next x 6 y 0)
 		  (setq next (random-tetramine)))
 		 (t (incf y) (start-timer timer)))))
-
-;    (draw-square :size 200)))
-    (funcall background)))
-;    (translate -288 218)
-;    (draw-grid (join-grids tetramine grid x y))
-;    (translate 440 440)
-;    (draw-grid next)))
+    (funcall background)
+    (translate -288 218)
+    (draw-grid (join-grids tetramine grid x y))
+    (translate 440 440)
+    (draw-grid next)
+    (render-text "Hola" font)))
 
 (let ((frame 0.0) (fps (make-timer)) (update (make-timer)))
   (start-timer update)