rcs id conventions

[bsdgames-darwin.git] / mille / init.c

diff --git a/mille/init.c b/mille/init.c
index 92b7e5c735803e6333077c99af30a607c5965bba..368862ad8e488d4d12a88b0b6571272d0c421131 100644 (file)
--- a/mille/init.c
+++ b/mille/init.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: init.c,v 1.5 1995/03/24 05:01:40 cgd Exp $     */
+
 /*
- * Copyright (c) 1982 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1982, 1993
+ *     The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)init.c     5.4 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: init.c,v 1.2 1993/08/01 18:54:02 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)init.c     8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: init.c,v 1.5 1995/03/24 05:01:40 cgd Exp $";
+#endif
 #endif /* not lint */
 
 # include      "mille.h"
@@ -94,7 +99,7 @@ shuffle() {
                r = roll(1, DECK_SZ) - 1;
                if (r < 0 || r > DECK_SZ - 1) {
                        fprintf(stderr, "shuffle: card no. error: %d\n", r);
-                       die();
+                       die(1);
                }
                temp = Deck[r];
                Deck[r] = Deck[i];
@@ -185,8 +190,7 @@ newscore() {
                mvaddstr(4, 37, "300");
                new = TRUE;
        }
-       else if (((Window == W_FULL || Finished) ^ was_full) ||
-                pp->was_finished != Finished) {
+       else if ((Window == W_FULL || Finished) ^ was_full) {
                move(5, 1);
                clrtobot();
                new = TRUE;
@@ -197,8 +201,8 @@ newscore() {
                for (i = 0; i < SCORE_Y; i++)
                        mvaddch(i, 0, '|');
                move(SCORE_Y - 1, 1);
-               while (addch('_') != ERR)
-                       continue;
+               for (i = 0; i < SCORE_X; i++)
+                       addch('_');
                for (pp = Player; pp <= &Player[COMP]; pp++) {
                        pp->sh_hand_tot = -1;
                        pp->sh_total = -1;