X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fgacela.scm;h=1d963c6772b29a5f1924d84f0aef14d4890c97d4;hb=cf6094cdd9222b104b1cf08637de9d8021473923;hp=569edc344d47c6d65af7912ca4efe9c7793500ae;hpb=c4dbd17a165312f189ec5211069dab4d039d5471;p=gacela.git

diff --git a/src/gacela.scm b/src/gacela.scm
index 569edc3..1d963c6 100644
--- a/src/gacela.scm
+++ b/src/gacela.scm
@@ -17,10 +17,12 @@
 
 ;;; Default values for Gacela
 
+(define *title* "Gacela")
 (define *width-screen* 640)
 (define *height-screen* 480)
 (define *bpp-screen* 32)
 (define *frames-per-second* 20)
+(define *mode* '2d)
 
 
 ;;; SDL Initialization Subsystem
@@ -81,7 +83,9 @@
 			(resize-screen-GL width height)))))
 
   (set! quit-video-mode
-	(lambda () (set! screen #f))))
+	(lambda ()
+	  (SDL_FreeSurface screen)
+	  (set! screen #f))))
 
 (define (set-2d-mode)
   (cond ((not (3d-mode?))
@@ -110,8 +114,9 @@
   (glClearColor 0 0 0 0)
 ;  (glClearDepth 1)
 ;  (glDepthFunc GL_LEQUAL)
-;  (glEnable GL_BLEND)
+  (glEnable GL_BLEND)
 ;  (glBlendFunc GL_SRC_ALPHA GL_ONE)
+  (glBlendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA)
   (glHint GL_PERSPECTIVE_CORRECTION_HINT GL_NICEST)
   #t)
 
@@ -164,11 +169,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)
@@ -189,11 +189,11 @@
 		   (SDL_Delay (- time-per-frame frame-time))))))))
 
 
-(define set-game-properties #f)
+(define set-game-properties! #f)
 (define get-game-properties #f)
 
-(let ((ptitle "") (pwidth *width-screen*) (pheight *height-screen*) (pbpp *bpp-screen*) (pfps *frames-per-second*) (pmode '2d))
-  (set! set-game-properties
+(let ((ptitle *title*) (pwidth *width-screen*) (pheight *height-screen*) (pbpp *bpp-screen*) (pfps *frames-per-second*) (pmode *mode*))
+  (set! set-game-properties!
 	(lambda* (#:key title width height bpp fps mode)
 ;	  (init-video-mode)
 	  (if title
@@ -240,22 +240,25 @@
 	(lambda ()
 	  (set! mobs (get-active-mobs))
 	  (set! running #t)
-	  (quit? #f)
+	  (quit! #f)
 	  (do () ((quit?))
-	    (if (sdl-on?) (init-frame-time))
+	    (init-frame-time)
 	    (check-connections)
 	    (eval-from-clients)
-	    (cond ((sdl-on?)
-		   (process-events)
-		   (cond ((not (quit?))
+	    (process-events)
+	    (cond ((not (quit?))
+		   (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))
-			  (run-mob-actions mobs)
-			  (render-mobs mobs)
-			  (SDL_GL_SwapBuffers)
-			  (delay-frame))))))
+			  (to-origin)))
+		   (cond ((mobs-changed?) (set! mobs (get-active-mobs))))
+		   (if (procedure? game-code)
+		       (catch #t
+			      (lambda () (game-code))
+			      (lambda (key . args) #f)))
+		   (cond ((video-mode-on?)
+			  (run-mobs mobs)
+			  (SDL_GL_SwapBuffers)))
+		   (delay-frame))))
 	  (set! running #f)))
 
   (set! game-running?
@@ -265,12 +268,3 @@
   (set! set-game-code
 	(lambda (game-function)
 	  (set! game-code game-function))))
-
-(define (quit-game)
-   (quit-audio)
-   (quit-video-mode)
-;  (quit-all-mobs)
-;   (kill-all-objects)
-;   (clear-events)
-   (quit-events)
-   (quit-sdl))