r5141: Auto commit for Debian build

[reversi.git] / io-clim.lisp

diff --git a/io-clim.lisp b/io-clim.lisp
index af7300837d9b5fc19539cf3b9502bc34edeeb586..12ea49b5f11370bf8004f960a24122de472cdc3f 100644 (file)
--- a/io-clim.lisp
+++ b/io-clim.lisp
@@ -8,16 +8,18 @@
 ;;;;  Programer:      Kevin M. Rosenberg
 ;;;;  Date Started:   1 Nov 2001
 ;;;;
-;;;; $Id: io-clim.lisp,v 1.8 2003/04/01 18:07:35 kevin Exp $
+;;;; $Id: io-clim.lisp,v 1.13 2003/06/12 12:42:13 kevin Exp $
 ;;;;
-;;;; This file is Copyright (c) 2001-2002 by Kevin M. Rosenberg 
+;;;; This file is Copyright (c) 2001-2003 by Kevin M. Rosenberg 
 ;;;;
 ;;;; Reversi users are granted the rights to distribute and use this software
 ;;;; as governed by the terms of the Lisp Lesser GNU Public License
 ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;;***************************************************************************
 
-(in-package :reversi)
+(in-package #:reversi)
+
+#+mcclim (shadowing-import 'clim-internals::stream-set-cursor-position)
 
 (defparameter cell-inner-width 40)
 (defparameter cell-inner-height 40)
@@ -345,9 +347,13 @@
                (format stream "Valid Moves~%~A" 
                        (list-to-delimited-string legal-moves #\space)))))
        (when (null (player game))
-         (if (plusp (final-result game))
-             (format stream "Black wins by ~d!" (final-result game))
-           (format stream "White wins by ~d!" (- 0 (final-result game)))))))))
+         (cond
+           ((zerop (final-result game))
+            (format stream "It's a draw!"))
+           ((plusp (final-result game))
+             (format stream "Black wins by ~d!" (final-result game)))
+           (t
+            (format stream "White wins by ~d!" (- 0 (final-result game))))))))))
 
 
 
@@ -671,10 +677,7 @@
                  (+ label-height (* cell-height i)
                       half-cell-inner-height))
                 :align-x :left :align-y :center))
-    (if (find-package 'mcclim)
-       (setf (stream-set-cursor-position stream)
-             (values label-width label-height))
-       (stream-set-cursor-position stream label-width label-height))
+    (stream-set-cursor-position stream label-width label-height)
     (surrounding-output-with-border (stream)
       (formatting-table (stream :y-spacing 0 :x-spacing 0)
        (dotimes (row 8)