(no commit message)

[gacela.git] / gacela_tetris.lisp

diff --git a/gacela_tetris.lisp b/gacela_tetris.lisp
index 6a64451d886c5696419c00f20458e5e5baa82e51..5435e96bfb8678bb6b651d52dcb6b3ee54a83eb3 100644 (file)
--- 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)))
@@ -119,9 +119,11 @@
       (next (random-tetramine))
       (timer (make-timer))
       (grid (make-list 20 :initial-element (make-list 14)))
-      (background (draw-image-function "fondo_tetris.png"))
+      (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)))
 
@@ -154,7 +156,7 @@
                  (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)
@@ -167,8 +169,8 @@
 (let ((frame 0.0) (fps (make-timer)) (update (make-timer)))
   (start-timer update)
   (start-timer fps)
-  (run-game "Gacela Tetris"
-           (game)
-           (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))