(no commit message)

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

diff --git a/src/gacela_events.scm b/src/gacela_events.scm
index a57e9a13039617ef1347e42eb53d6157283d6233..cd939850027962c72d157a954b05fe8e490c83cb 100644 (file)
--- a/src/gacela_events.scm
+++ b/src/gacela_events.scm
@@ -45,7 +45,7 @@
   (cond ((not (null? events))
         (let ((event (car events)))
           (cond ((= (assoc-ref event 'type) SDL_KEYDOWN) (key-press (assoc-ref event 'key.keysym.sym)))
-                ((= (assoc-ref event 'type) SDL_KEYUP) (key-release (assoc-ref event :key.keysym.sym)))))
+                ((= (assoc-ref event 'type) SDL_KEYUP) (key-release (assoc-ref event 'key.keysym.sym)))))
         (process-keyboard-events (cdr events)))))
 
 (define key? #f)

diff --git a/src/gacela_mobs.scm b/src/gacela_mobs.scm
index 3e3e17a907aebf7dcd0d46b1f47f9f173a1d3b2c..de76938d5f14d41e5f2c802897b286d7896105b1 100755 (executable)
--- a/src/gacela_mobs.scm
+++ b/src/gacela_mobs.scm
@@ -17,44 +17,39 @@
 
 ;;; Mobs Factory
 
-(define add-mob-symbol #f)
+(define add-mob-lambda #f)
 (define kill-mob-symbol #f)
 (define get-active-mobs #f)
-(define reload-mobs? #f)
-(define mobs-reloaded #f)
+(define mobs-changed? #f)
 
-(let ((active-mobs '()) (reload #f))
-  (set! add-mob-symbol
+(let ((active-mobs '()) (changed #f))
+  (set! add-mob-lambda
        (lambda (mob)
          (pushnew mob active-mobs)
-         (set! reload #t)))
+         (set! changed #t)))
 
   (set! kill-mob-symbol
        (lambda (mob)
          (set! active-mobs (lset-difference eq? active-mobs (list mob)))
-         (set! reload #t)))
+         (set! changed #t)))
 
   (set! get-active-mobs
-       (lambda () active-mobs))
+       (lambda* (#:optional (refreshed #t))
+         (set! changed (not refreshed))
+         active-mobs))
 
-  (set! reload-mobs?
-       (lambda () reload))
+  (set! mobs-changed?
+       (lambda () changed)))
 
-  (set! mobs-reloaded
-       (lambda () (set! reload #f))))
 
 (define-macro (add-mob mob)
-  `(add-mob-symbol ',mob))
+  `(add-mob-lambda (lambda (option) (,mob option))))
 
 (define-macro (kill-mob mob)
   `(kill-mob-symbol ',mob))
 
-(define-macro (get-mobs-function)
-  (let ((mobs (get-active-mobs)))
-    (cond ((null? mobs)
-          `(lambda () #f))
-         (else
-          `(lambda () ,@(map (lambda (mob) `(,mob #:render)) mobs))))))
+(define (process-mobs mobs)
+  (for-each (lambda (m) (m #:render)) mobs))
 
 (define-macro (define-mob mob-head . look)
   (let ((name (car mob-head)) (attr (cdr mob-head)))