(no commit message)

[gacela.git] / gacela_mobs.lisp

diff --git a/gacela_mobs.lisp b/gacela_mobs.lisp
index 0b05c5d97a7379ce1e05b5339e00447a6ec15deb..3c6fec0831830540895f716f4e4907e343ae998e 100755 (executable)
--- a/gacela_mobs.lisp
+++ b/gacela_mobs.lisp
@@ -15,7 +15,7 @@
 ;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-;;; World of Mob
+;;; Mob Factory
 
 (in-package :gacela)
 
@@ -23,35 +23,22 @@
   `(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)))
+      (apply (symbol-function mob) (cons option args))))
 
   (defun mob-off (mob)
     (push mob mobs-to-quit))
@@ -59,8 +46,15 @@
   (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))))
+       (funcall (symbol-function mob) :init))
+    (setq running-mobs (reverse (set-difference running-mobs mobs-to-quit))))
 
   (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))))