(no commit message)

[gacela.git] / gacela_mobs.lisp

diff --git a/gacela_mobs.lisp b/gacela_mobs.lisp
index 105e0441fc8af08e24535493e3d92bc3f21d479a..8f3d903120c6af184f7c5847c3006c112b60982e 100755 (executable)
--- a/gacela_mobs.lisp
+++ b/gacela_mobs.lisp
@@ -15,16 +15,19 @@
 ;;; 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)))))))
@@ -38,7 +41,7 @@
   (defun run-mobs (option &key args function)
     (dolist (mob running-mobs)
       (cond (function (funcall function)))
-      (apply mob (cons option args))))
+      (secure-block nil (apply (symbol-function mob) (cons option args)))))
 
   (defun mob-off (mob)
     (push mob mobs-to-quit))
@@ -46,8 +49,9 @@
   (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)))