From: jsancho <devnull@localhost>
Date: Sun, 25 Oct 2009 17:51:46 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: https://git.jsancho.org/?a=commitdiff_plain;h=95beeaac7a0e035769abb62ad6ce049e0ea7ef82;p=gacela.git

---

diff --git a/gacela.lisp b/gacela.lisp
index 6597f78..5f52cb0 100644
--- a/gacela.lisp
+++ b/gacela.lisp
@@ -156,6 +156,18 @@
 (defun make-resource-font (&key filename encoding)
   `(:type font :filename ,filename :enconding ,encoding))
 
+(defmacro get-rtime (key)
+  `(resource-time (gethash ,key resources-table)))
+
+(defmacro get-rplist (key)
+  `(resource-plist (gethash ,key resources-table)))
+
+(defmacro get-rconstructor (key)
+  `(resource-constructor (gethash ,key resources-table)))
+
+(defmacro get-rdestructor (key)
+  `(resource-destructor (gethash ,key resources-table)))
+
 (let ((resources-table (make-hash-table :test 'equal)))
 
   (defun set-resource (key plist constructor destructor &key static)
@@ -166,16 +178,15 @@
 			 :time (if static t (SDL_GetTicks)))))
 
   (defun get-resource (key)
-    (let ((resource (gethash key resources-table)))
-      (cond ((null resource) nil)
-	    (t (cond ((/= (resource-time resource) -1)
-		      (setf (resource-time resource) (SDL_GetTicks))
-		      (setf (gethash key resources-table) resource)))
-	       (resource-plist resource)))))
+    (cond ((null (gethash key resources-table)) nil)
+	  (t (let ((time (get-rtime key)))
+	       (cond ((null time) (funcall (get-rconstructor key)))
+		     ((numberp time) (setf (get-rtime key) (SDL_GetTicks))))
+	       (get-rplist key)))))
 
   (defun free-resource (key)
-    (funcall (resource-destructor (gethash key resources-table)))
-    (setf (resource-time (gethash key resources-table)) nil))
+    (funcall (get-rdestructor key))
+    (setf (get-rtime key) nil))
 
   (defun free-all-resources ()
     (maphash (lambda (key res) (free-resource key)) resources-table)))
@@ -235,9 +246,8 @@
 	 (setq running nil))))
 
 (defun quit-game ()
-;  (free-all-resources)
+  (free-all-resources)
 ;  (quit-audio)
-;  (quit-ttf)
   (quit-video-mode)
 ;  (quit-all-procs)
 ;  (clear-events)
diff --git a/gacela_tetris.lisp b/gacela_tetris.lisp
index 8295710..6a64451 100644
--- a/gacela_tetris.lisp
+++ b/gacela_tetris.lisp
@@ -109,7 +109,10 @@
 
   (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)
@@ -117,7 +120,15 @@
       (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)))
+      (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,6 +151,7 @@
 		      (> (+ 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)
@@ -156,6 +168,7 @@
   (start-timer update)
   (start-timer fps)
   (run-game "Gacela Tetris"
-	    (tetramine)
+	    (game)
 	    (incf frame)
-	    (cond ((> (get-time update) 1000) (print (/ frame (/ (get-time fps) 1000.0))) (start-timer update)))))
+	    (cond ((> (get-time update) 1000) (print (/ frame (/ (get-time fps) 1000.0))) (start-timer update))))
+  (quit-game))