X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=gacela.lisp;h=5f52cb045cabdc692124eb42e8ee085a051ad0ad;hb=8f452e676ff1c49ad238f9ed43d834af67896c46;hp=eecc4893ee41e5196887514e79932e302bb571d8;hpb=8caa865a3194eb573382a411df7636ebb472ca1f;p=gacela.git

diff --git a/gacela.lisp b/gacela.lisp
index eecc489..5f52cb0 100644
--- a/gacela.lisp
+++ b/gacela.lisp
@@ -153,8 +153,20 @@
 (defun make-resource-texture (&key filename min-filter mag-filter)
   `(:type texture :filename ,filename :min-filter ,min-filter :mag-filter ,mag-filter))
 
-(defun make-resource-font (&key filename size encoding)
-  `(:type font :filename ,filename :size ,size :enconding ,encoding))
+(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)))
 
@@ -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)