X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=gacela_mobs.lisp;h=8f3d903120c6af184f7c5847c3006c112b60982e;hb=6a3d1ffb69036e6d4f1c239fd7d52f9bfc48d50c;hp=0b05c5d97a7379ce1e05b5339e00447a6ec15deb;hpb=8b8cbb5b5b97e337dd6790aa7959a2dd68853e1b;p=gacela.git

diff --git a/gacela_mobs.lisp b/gacela_mobs.lisp
index 0b05c5d..8f3d903 100755
--- a/gacela_mobs.lisp
+++ b/gacela_mobs.lisp
@@ -15,43 +15,33 @@
 ;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-;;; World of Mob
+(eval-when (compile load eval)
+	   (when (not (find-package 'gacela)) (make-package 'gacela :nicknames '(gg) :use '(lisp)))
+	   (in-package 'gacela :nicknames '(gg) :use '(lisp)))
 
-(in-package :gacela)
+
+;;; Mob Factory
 
 (defmacro makemob (name &rest methods)
   `(defun ,name (&rest args &aux (option (car args)))
      ,(union
        `(case option
-	      (:on (mob-on #',name))
-	      (:off (mob-off #',name)))
+	      (:on (mob-on ',name))
+	      (:off (mob-off ',name)))
        (labels ((options (m &aux (option (car m)) (body (cadr m)))
 			 (cond ((null m) nil)
 			       (t (cons (list option `(apply ,body (cdr args))) (options (cddr m)))))))
 	       (options methods)))))
 
-(defmacro mob-structure (variables init logic render)
-  `(list
-    :init (lambda () ,init)
-    :logic (lambda () ,logic)
-    :render (lambda () ,render)
-    :context (lambda ()
-	       ,(if variables
-		    `(mapcar #'list
-			     ',(mapcar #'car+ variables)
-			     (multiple-value-list
-			      (values-list ,(cons 'list (mapcar #'car+ variables)))))
-		  nil))))
 
 (let (running-mobs mobs-to-add mobs-to-quit)
   (defun mob-on (mob)
     (push mob mobs-to-add))
 
-  (defun logic-mobs ()
-    (dolist (mob running-mobs) (funcall mob :logic)))
-
-  (defun render-mobs ()
-    (dolist (mob running-mobs) (funcall mob :render)))
+  (defun run-mobs (option &key args function)
+    (dolist (mob running-mobs)
+      (cond (function (funcall function)))
+      (secure-block nil (apply (symbol-function mob) (cons option args)))))
 
   (defun mob-off (mob)
     (push mob mobs-to-quit))
@@ -59,8 +49,16 @@
   (defun refresh-running-mobs ()
     (do ((mob (pop mobs-to-add) (pop mobs-to-add))) ((null mob))
 	(push mob running-mobs)
-	(funcall mob :init))
-    (setq running-mobs (reverse (set-difference running-mobs mobs-to-quit :test #'equal))))
+	(secure-block nil (funcall (symbol-function mob) :init)))
+    (setq running-mobs (reverse (set-difference running-mobs mobs-to-quit)))
+    (setq mobs-to-quit nil))
 
   (defun quit-all-mobs ()
     (setq running-mobs nil mobs-to-add nil mobs-to-quit nil)))
+
+
+(defun logic-mobs ()
+  (run-mobs :logic))
+
+(defun render-mobs ()
+  (run-mobs :render :function (lambda () (glLoadIdentity))))