(no commit message)

[gacela.git] / src / gacela.scm

diff --git a/src/gacela.scm b/src/gacela.scm
index 26a1e9cf93bd1935d17d289c78e090f0f461b308..aeea861a222d133e94202fe1eca3efd1ea0401a9 100644 (file)
--- a/src/gacela.scm
+++ b/src/gacela.scm
@@ -26,6 +26,7 @@
 ;;; SDL Initialization Subsystem
 
 (define init-sdl #f)
+(define sdl-on? #f)
 (define quit-sdl #f)
 
 (let ((initialized #f))
@@ -34,6 +35,10 @@
          (cond ((not initialized) (SDL_Init SDL_INIT_EVERYTHING) (set! initialized #t))
                (else initialized))))
 
+  (set! sdl-on?
+       (lambda ()
+         (if initialized #t #f)))
+
   (set! quit-sdl
        (lambda ()
          (SDL_Quit)
@@ -139,22 +144,6 @@
          (set! current-color (list red green blue alpha))
          (glColor4f red green blue alpha))))
 
-(define* (load-image image-file #:key transparent-color)
-  (init-video-mode)
-  (let ((loaded-image (IMG_Load image-file)))
-    (cond ((= loaded-image 0) #f)
-         (else (let ((optimized-image (SDL_DisplayFormat loaded-image)))
-                 (SDL_FreeSurface loaded-image)
-                 (cond ((= optimized-image 0) #f)
-                       ((not transparent-color) optimized-image)
-                       (else (SDL_SetColorKey optimized-image
-                                              SDL_SRCCOLORKEY
-                                              (SDL_MapRGB (surface-format optimized-image)
-                                                          (car transparent-color)
-                                                          (cadr transparent-color)
-                                                          (caddr transparent-color)))
-                             optimized-image)))))))
-
 
 ;;; Audio Subsystem
 
@@ -175,11 +164,6 @@
 
 ;;; GaCeLa Functions
 
-(define (init-gacela)
-  (init-sdl)
-  (init-gl))
-
-
 (define set-frames-per-second #f)
 (define init-frame-time #f)
 (define delay-frame #f)
@@ -251,19 +235,22 @@
        (lambda ()
          (set! mobs (get-active-mobs))
          (set! running #t)
-         (quit? #f)
+         (quit! #f)
          (do () ((quit?))
            (init-frame-time)
-;          (check-connections)
-;          (eval-from-clients)
+           (check-connections)
+           (eval-from-clients)
            (process-events)
            (cond ((not (quit?))
-                  (glClear (+ GL_COLOR_BUFFER_BIT GL_DEPTH_BUFFER_BIT))
-                  (to-origin)
+                  (cond ((video-mode-on?)
+                         (glClear (+ GL_COLOR_BUFFER_BIT GL_DEPTH_BUFFER_BIT))
+                         (to-origin)))
                   (cond ((mobs-changed?) (set! mobs (get-active-mobs))))
                   (if (procedure? game-code) (game-code))
-                  (process-mobs mobs)
-                  (SDL_GL_SwapBuffers)
+                  (run-mob-actions mobs)
+                  (cond ((video-mode-on?)
+                         (render-mobs mobs)
+                         (SDL_GL_SwapBuffers)))
                   (delay-frame))))
          (set! running #f)))