X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fgacela_mobs.scm;h=8c687dc5b42158dd01748059c7c88e552aa7c6da;hb=91e03880066280940b29a89eae28510e124e58cb;hp=5ae3296ab0287601d48b91062623f2e5aa3930b4;hpb=b50916459d90f604043ea688750c55a516636796;p=gacela.git

diff --git a/src/gacela_mobs.scm b/src/gacela_mobs.scm
index 5ae3296..8c687dc 100755
--- a/src/gacela_mobs.scm
+++ b/src/gacela_mobs.scm
@@ -20,6 +20,7 @@
 (define show-mob-hash #f)
 (define hide-mob-hash #f)
 (define get-active-mobs #f)
+(define clear-active-mobs #f)
 (define mobs-changed? #f)
 
 (let ((active-mobs (make-hash-table)) (changed #f))
@@ -38,6 +39,11 @@
 	  (set! changed (not refreshed))
 	  (hash-map->list (lambda (k v) v) active-mobs)))
 
+  (set! clear-active-mobs
+	(lambda ()
+	  (set! changed #t)
+	  (hash-clear! active-mobs)))
+
   (set! mobs-changed?
 	(lambda () changed)))
 
@@ -48,8 +54,11 @@
 (define-macro (hide-mob mob)
   `(hide-mob-hash ',mob))
 
-(define (process-mobs mobs)
-  (for-each (lambda (m) (m #:render)) mobs))
+(define (run-mob-actions mobs)
+  (for-each (lambda (m) (m 'run-actions)) mobs))
+
+(define (render-mobs mobs)
+  (for-each (lambda (m) (m 'render)) mobs))
 
 
 ;;; Actions and looks for mobs
@@ -113,7 +122,7 @@
 (define-macro (lambda-mob attr . look)
   `(let ((mob #f))
      (set! mob
-	   (let ((attr ',attr) (actions '()) (renders '()))
+	   (let ((attr ',attr) (actions '()) (looks '()))
 	     (lambda (option . params)
 	       (case option
 		 ((get-attr)
@@ -124,15 +133,74 @@
 		  actions)
 		 ((set-actions)
 		  (if (not (null? params)) (set! actions (car params))))
-		 ((get-renders)
-		  renders)
-		 ((set-renders)
-		  (if (not (null? params)) (set! renders (car params))))
+		 ((get-looks)
+		  looks)
+		 ((set-looks)
+		  (if (not (null? params)) (set! looks (car params))))
+		 ((run-actions)
+		  (for-each
+		   (lambda (action)
+		     (set! attr ((cdr action) attr)))
+		   actions))
 		 ((render)
-		  (for-each (lambda (render) ((cdr render) attr)) renders))))))
+		  (for-each
+		   (lambda (look)
+		     ((cdr look) attr))
+		   looks))))))
      (cond ((not (null? ',look))
-	    (mob 'set-renders
+	    (mob 'set-looks
 		 (list (cons
 			'default-look
 			(lambda-look ,attr ,@look))))))
      mob))
+
+(define-macro (define-mob mob-def)
+  (let ((name (car mob-def)) (def (cdr mob-def)))
+    `(define ,name
+       (lambda-mob ,def))))
+
+(defmacro* lambda-mob (#:key (attr '()) (action #f) (look #f))
+  `(let ((attr ,attr) (action ,action) (look ,look))
+     (lambda (option . params)
+       (case option
+	 ((get-attr)
+	  attr)
+	 ((set-attr)
+	  (if (not (null? params)) (set! attr (car params))))
+	 ((get-action)
+	  action)
+	 ((set-action)
+	  (if (not (null? params)) (set! action (car params))))
+	 ((get-look)
+	  look)
+	 ((set-look)
+	  (if (not (null? params)) (set! look (car params))))
+	 ((run-mob)
+	  (lambda (action)
+		     (set! attr ((cdr action) attr)))
+		   actions))
+		 ((render)
+		  (for-each
+		   (lambda (look)
+		     ((cdr look) attr))
+		   looks))))))
+
+
+(define (get-mob-attr mob var)
+  (let ((value (assoc-ref (mob 'get-attr) var)))
+    (if value (car value) #f)))
+
+(define (set-mob-attr! mob var value)
+  (mob 'set-attr (assoc-set! (mob 'get-attr) var (list value))))
+
+(define (add-mob-action mob name action)
+  (mob 'set-actions (assoc-set! (mob 'get-actions) name action)))
+
+(define (quit-mob-action mob name)
+  (mob 'set-actions (assoc-remove! (mob 'get-actions) name)))
+
+(define (add-mob-look mob name look)
+  (mob 'set-looks (assoc-set! (mob 'get-looks) name look)))
+
+(define (quit-mob-look mob name)
+  (mob 'set-looks (assoc-remove! (mob 'get-looks) name)))