From: jsancho <devnull@localhost>
Date: Thu, 11 Aug 2011 16:17:12 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: https://git.jsancho.org/?a=commitdiff_plain;h=7174f4c01e133fc25458837cea6ea09287afdec9;p=gacela.git

---

diff --git a/gacela_tetris.scm b/gacela_tetris.scm
index b8c3b57..dbda408 100644
--- a/gacela_tetris.scm
+++ b/gacela_tetris.scm
@@ -120,7 +120,7 @@
 	  (set! lines (+ lines l)))))
 
 (define game #f)
-(define game-over #f)
+(define display-game-over #f)
 (define tetramine #f)
 
 (let ((current-tetramine (random-tetramine)) (x 6) (y 0)
@@ -133,16 +133,16 @@
 
   (set! game
 	(lambda ()
-	  (if game-over (game-over) (tetramine))))
+	  (if game-over (display-game-over) (tetramine))))
 
-  (set! game-over
+  (set! display-game-over
 	(lambda ()
 	  (translate -100 0)
 	  (render-text "Game Over" font #:size 50)))
 
   (set! tetramine
 	(lambda ()
-	  (cond ((eq? (timer-state timer) 'stopped) (start-timer timer)))
+	  (cond ((eq? (get-state timer) 'stopped) (start-timer timer)))
 
 	  (cond ((key? 'right)
 		 (cond ((not (collide-grids current-tetramine grid (+ x 1) y))
@@ -163,7 +163,7 @@
 			    (> (+ y 1 (length current-tetramine)) 20))
 			(set! grid (remove-rows-completed (join-grids current-tetramine grid x y)))
 			(set! current-tetramine next x 6 y 0)
-			(cond ((collide-grids current-tetramine grid x y) (set! game-over t)))
+			(cond ((collide-grids current-tetramine grid x y) (set! game-over #t)))
 			(set! next (random-tetramine)))
 		       (else
 			(set! y (+ y 1))
@@ -174,9 +174,9 @@
 	  (translate 440 440)
 	  (draw-grid next)
 	  (translate -40 -100)
-	  (render-text (format nil "Points: ~d" (get-points)) font)
+	  (render-text (format #f "Points: ~a" (get-points)) font)
 	  (translate 0 -30)
-	  (render-text (format nil "Lines: ~d" (get-lines)) font))))
+	  (render-text (format #f "Lines: ~a" (get-lines)) font))))
 
 (define (run-gacela-tetris)
   (let ((frame 0.0) (fps (make-timer)) (update (make-timer)))
@@ -188,5 +188,4 @@
      (cond ((> (get-time update) 1000)
 	    (display (/ frame (/ (get-time fps) 1000.0)))
 	    (newline)
-	    (start-timer update))))
-    (quit-game)))
+	    (start-timer update))))))
diff --git a/src/gacela_widgets.scm b/src/gacela_widgets.scm
index fedc563..9d6cea4 100755
--- a/src/gacela_widgets.scm
+++ b/src/gacela_widgets.scm
@@ -20,21 +20,45 @@
 (define (make-timer)
   (let ((start 0) (paused 0) (state 'stopped))
     (lambda (op)
-      (case op
-	(('start-timer)
-	 (set! start (SDL_GetTicks))
-	 (set! state 'running))
-	(('stop-timer)
-	 (set! state 'stopped))
-	(('get-time)
-	 (cond ((eq? state 'stopped) 0)
-	       ((eq? state 'paused) paused)
-	       (else (- (SDL_GetTicks) start))))
-	(('pause-timer)
-	 (cond ((eq? state 'running)
-		(set! paused (- (SDL_GetTicks) start))
-		(set! state 'paused))))
-	(('resume-timer)
-	 (cond ((eq? state 'paused)
-		(set! start (- (SDL_GetTicks) paused))
-		(set! state 'running))))))))
+      (cond ((eq? op 'start-timer)
+	     (set! start (SDL_GetTicks))
+	     (set! state 'running))
+
+	    ((eq? op 'stop-timer)
+	     (set! state 'stopped))
+
+	    ((eq? op 'get-time)
+	     (cond ((eq? state 'stopped) 0)
+		   ((eq? state 'paused) paused)
+		   (else (- (SDL_GetTicks) start))))
+
+	    ((eq? op 'get-state)
+	     state)
+
+	    ((eq? op 'pause-timer)
+	     (cond ((eq? state 'running)
+		    (set! paused (- (SDL_GetTicks) start))
+		    (set! state 'paused))))
+
+	    ((eq? op 'resume-timer)
+	     (cond ((eq? state 'paused)
+		    (set! start (- (SDL_GetTicks) paused))
+		    (set! state 'running))))))))
+
+(define (start-timer timer)
+  (timer 'start-timer))
+
+(define (stop-timer timer)
+  (timer 'stop-timer))
+
+(define (get-time timer)
+  (timer 'get-time))
+
+(define (get-state timer)
+  (timer 'get-state))
+
+(define (pause-timer timer)
+  (timer 'pause-timer))
+
+(define (resume-timer timer)
+  (timer 'resume-timer))