Games properties.

[gacela.git] / src / gacela.scm

diff --git a/src/gacela.scm b/src/gacela.scm
index 256e940c78c64f9df172551a3698b14428288fd6..a0b9b22a137a4d8d958c9952ed880f18de61bf0a 100644 (file)
--- a/src/gacela.scm
+++ b/src/gacela.scm
@@ -22,6 +22,14 @@
   #:use-module (ice-9 optargs)
   #:export (load-texture
            load-font
+           *title*
+           *width-screen*
+           *height-screen*
+           *bpp-screen*
+           *frames-per-second*
+           *mode*
+           set-game-properties!
+           get-game-properties
            init-gacela
            quit-gacela
            game-loop
@@ -48,16 +56,6 @@
               render-text))
 
 
-;;; 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)
-
-
 ;;; Resources Cache
 
 (define resources-cache (make-weak-value-hash-table))
@@ -88,37 +86,31 @@
 
 ;;; Game Properties
 
-(define set-game-properties! #f)
-(define get-game-properties #f)
-
-;; (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
-;;           (begin
-;;             (set! ptitle title)
-;;             (if (video-mode-on?) (SDL_WM_SetCaption title ""))))
-;;       (if (or width height bpp)
-;;           (begin
-;;             (if width (set! pwidth width))
-;;             (if height (set! pheight height))
-;;             (if bpp (set! pbpp bpp))
-;;             (if (video-mode-on?) (resize-screen pwidth pheight pbpp))))
-;;       (if fps
-;;           (begin
-;;             (set! pfps fps)
-;;             (set-frames-per-second fps)))
-;;       (if mode
-;;           (begin
-;;             (set! pmode mode)
-;;             (if (video-mode-on?)
-;;                 (if (eq? mode '3d) (set-3d-mode) (set-2d-mode)))))
-;;       (get-game-properties)))
-
-;;   (set! get-game-properties
-;;     (lambda ()
-;;       `((title . ,ptitle) (width . ,pwidth) (height . ,pheight) (bpp . ,pbpp) (fps . ,pfps) (mode . ,pmode)))))
+(define *title* "Gacela")
+(define *width-screen* 640)
+(define *height-screen* 480)
+(define *bpp-screen* 32)
+(define *frames-per-second* 20)
+(define *mode* '2d)
+
+(define* (set-game-properties! #:key title width height bpp fps mode)
+  (if title
+      (set-screen-title! title))
+  (if bpp
+      (set-screen-bpp! bpp))
+  (if (or width height)
+      (begin
+       (if (not width) (set! width (get-screen-width)))
+       (if (not height) (set! height (get-screen-height)))
+       (resize-screen width height)))
+  (if fps
+      (set-frames-per-second! fps))
+  (if mode
+      (if (eq? mode '3d) (set-3d-mode) (set-2d-mode)))
+  (get-game-properties))
+
+(define (get-game-properties)
+  `((title . ,(get-screen-title)) (width . ,(get-screen-width)) (height . ,(get-screen-height)) (bpp . ,(get-screen-bpp)) (fps . ,(get-frames-per-second)) (mode . ,(if (3d-mode?) '3d '2d))))
 
 
 ;;; Main Loop
@@ -143,12 +135,14 @@
 (define (game-loop)
 ;        (refresh-active-mobs)
   (set! loop-flag #t)
-  (init-video 640 480 32)
+  (init-video *width-screen* *height-screen* *bpp-screen* #:title *title* #:mode *mode* #:fps *frames-per-second*)
   (while loop-flag
         (init-frame-time)
 ;          (check-connections)
         (process-events)
-        (cond ((not (quit?))
+        (cond ((quit-signal?)
+               (quit-gacela))
+              (else
                (clear-screen)
                (to-origin)
 ;                 (refresh-active-mobs)