X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fgacela.scm;h=c8c9fffc35d178e1b83ad104cca44d78fb19c1bb;hb=ee8cc28a7551d08466af97636c38e55516a22876;hp=26a1e9cf93bd1935d17d289c78e090f0f461b308;hpb=4ae3375d30bc921cb397feef4024c84ef29f9b74;p=gacela.git

diff --git a/src/gacela.scm b/src/gacela.scm
index 26a1e9c..c8c9fff 100644
--- 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
 
@@ -251,20 +240,22 @@
 	(lambda ()
 	  (set! mobs (get-active-mobs))
 	  (set! running #t)
-	  (quit? #f)
+	  (quit! #f)
 	  (do () ((quit?))
-	    (init-frame-time)
-;	    (check-connections)
-;	    (eval-from-clients)
-	    (process-events)
-	    (cond ((not (quit?))
-		   (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)
-		   (delay-frame))))
+	    (if (sdl-on?) (init-frame-time))
+	    (check-connections)
+	    (eval-from-clients)
+	    (cond ((sdl-on?)
+		   (process-events)
+		   (cond ((not (quit?))
+			  (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))
+			  (run-mob-actions mobs)
+			  (render-mobs mobs)
+			  (SDL_GL_SwapBuffers)
+			  (delay-frame))))))
 	  (set! running #f)))
 
   (set! game-running?