(no commit message)

diff --git a/src/gacela.scm b/src/gacela.scm
index b03440a8ce21679f740c3f79a6c84cd7a28c3dd3..6be5ee8a5d178c8eb213af34899bbbdfcd730276 100644 (file)
--- a/src/gacela.scm
+++ b/src/gacela.scm
@@ -220,7 +220,7 @@
 (define game-running? #f)
 (define set-game-code #f)
 
-(let ((running #f) (game-code #f))
+(let ((running #f) (game-code #f) (mobs-function (lambda () #f)))
   (set! game-loop
        (lambda ()
          (set! running #t)
@@ -233,9 +233,11 @@
            (cond ((not (quit?))
                   (glClear (+ GL_COLOR_BUFFER_BIT GL_DEPTH_BUFFER_BIT))
                   (to-origin)
-;                (refresh-active-objects)
+                  (cond ((reload-mobs?)
+                         (set! mobs-function (get-mobs-function))
+                         (mobs-reloaded)))
                   (if (procedure? game-code) (game-code))
-;                (render-objects)
+                  (mobs-function)
                   (SDL_GL_SwapBuffers)
                   (delay-frame))))
          (set! running #f)))

diff --git a/src/gacela_mobs.scm b/src/gacela_mobs.scm
index 497e827a3fd95287602e54048f953e1cf5e53d9f..3e3e17a907aebf7dcd0d46b1f47f9f173a1d3b2c 100755 (executable)
--- a/src/gacela_mobs.scm
+++ b/src/gacela_mobs.scm
@@ -17,38 +17,50 @@
 
 ;;; Mobs Factory
 
-(define add-mob #f)
-(define kill-mob #f)
+(define add-mob-symbol #f)
+(define kill-mob-symbol #f)
 (define get-active-mobs #f)
 (define reload-mobs? #f)
+(define mobs-reloaded #f)
 
-(let ((active-mobs '(m1 m2)) (reload #f))
-  (set! add-mob
+(let ((active-mobs '()) (reload #f))
+  (set! add-mob-symbol
        (lambda (mob)
-         (pushnew (procedure-name mob) active-mobs)
+         (pushnew mob active-mobs)
          (set! reload #t)))
 
-  (set! kill-mob
+  (set! kill-mob-symbol
        (lambda (mob)
-         (set! active-mobs (lset-difference eq? active-mobs (list (procedure-name mob))))
+         (set! active-mobs (lset-difference eq? active-mobs (list mob)))
          (set! reload #t)))
 
   (set! get-active-mobs
        (lambda () active-mobs))
 
   (set! reload-mobs?
-       (lambda () reload)))
+       (lambda () reload))
 
+  (set! mobs-reloaded
+       (lambda () (set! reload #f))))
+
+(define-macro (add-mob mob)
+  `(add-mob-symbol ',mob))
+
+(define-macro (kill-mob mob)
+  `(kill-mob-symbol ',mob))
 
 (define-macro (get-mobs-function)
   (let ((mobs (get-active-mobs)))
-    `(lambda () ,@(map (lambda (mob) `(,mob)) mobs))))
+    (cond ((null? mobs)
+          `(lambda () #f))
+         (else
+          `(lambda () ,@(map (lambda (mob) `(,mob #:render)) mobs))))))
 
 (define-macro (define-mob mob-head . look)
   (let ((name (car mob-head)) (attr (cdr mob-head)))
     `(begin
        (define ,name #f)
-       (let ((attr ,attr))
+       (let ((attr ',attr))
         (set! ,name
               (lambda (option)
                 (case option