(no commit message)

[gacela.git] / gacela_mobs.lisp

diff --git a/gacela_mobs.lisp b/gacela_mobs.lisp
index 8ea8c5e3fc98d0cbf7e559c786df5353fc328dc1..0b05c5d97a7379ce1e05b5339e00447a6ec15deb 100755 (executable)
--- a/gacela_mobs.lisp
+++ b/gacela_mobs.lisp
@@ -17,7 +17,7 @@
 
 ;;; World of Mob
 
-;(in-package :gacela)
+(in-package :gacela)
 
 (defmacro makemob (name &rest methods)
   `(defun ,name (&rest args &aux (option (car args)))
@@ -30,17 +30,6 @@
                               (t (cons (list option `(apply ,body (cdr args))) (options (cddr m)))))))
               (options methods)))))
 
-(defmacro defmob (name variables &key init logic render)
-  `(let ((make-name ',(intern (concatenate 'string "MAKE-" (string name)))))
-     (setf (symbol-function make-name)
-          (makemob ,variables :init ,init :logic ,logic :render ,render))
-     make-name))
-
-;(defmacro makemob (variables &key init logic render)
-;  `(lambda
-;     ,(if (null variables) () (cons '&key variables))
-;     (mob-structure ,variables ,init ,logic ,render)))
-
 (defmacro mob-structure (variables init logic render)
   `(list
     :init (lambda () ,init)
@@ -54,18 +43,24 @@
                              (values-list ,(cons 'list (mapcar #'car+ variables)))))
                  nil))))
 
-(defun init-mob (mob)
-  (funcall (getf mob :init)))
-
-(defun logic-mob (mob)
-  (funcall (getf mob :logic)))
-
-(defun render-mob (mob)
-  (funcall (getf mob :render)))
-
 (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 mob-off (mob)
-    (push mob mobs-to-quit)))
+    (push mob mobs-to-quit))
+
+  (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))))
+
+  (defun quit-all-mobs ()
+    (setq running-mobs nil mobs-to-add nil mobs-to-quit nil)))