select() -> poll()

[bsdgames-darwin.git] / robots / score.c

diff --git a/robots/score.c b/robots/score.c
index ddc8ce56e14b1c48cdeb74290c081d0d2e2d0550..03038b9b35f19a6fe16b65321cccb438e522fc1d 100644 (file)
--- a/robots/score.c
+++ b/robots/score.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: score.c,v 1.9 1999/09/08 21:57:20 jsm Exp $    */
+/*     $NetBSD: score.c,v 1.15 2000/04/27 19:31:23 thorpej Exp $       */

 
 /*
  * Copyright (c) 1980, 1993
 
 /*
  * Copyright (c) 1980, 1993


@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)score.c    8.1 (Berkeley) 5/31/93";
 #else
 #if 0
 static char sccsid[] = "@(#)score.c    8.1 (Berkeley) 5/31/93";
 #else

-__RCSID("$NetBSD: score.c,v 1.9 1999/09/08 21:57:20 jsm Exp $");
+__RCSID("$NetBSD: score.c,v 1.15 2000/04/27 19:31:23 thorpej Exp $");

 #endif
 #endif /* not lint */
 
 #endif
 #endif /* not lint */
 


@@ -116,18 +116,17 @@ write_score(inf)
  *     top list.
  */
 void
  *     top list.
  */
 void

-score()
+score(score_wfd)
+       int score_wfd;

 {
 {

-       int                     inf;
+       int                     inf = score_wfd;

        SCORE                   *scp;
        SCORE                   *scp;

-       int                     uid;
+       u_int32_t               uid;

        bool                    done_show = FALSE;
 
        Newscore = FALSE;
        bool                    done_show = FALSE;
 
        Newscore = FALSE;

-       if ((inf = open(Scorefile, O_RDWR)) < 0) {
-               warn("opening `%s'", Scorefile);
+       if (inf < 0)

                return;
                return;

-       }

 
        read_score(inf);
 
 
        read_score(inf);
 


@@ -135,8 +134,7 @@ score()
        if (Top[MAXSCORES-1].s_score <= Score) {
                numscores = 0;
                for (scp = Top; scp < &Top[MAXSCORES]; scp++)
        if (Top[MAXSCORES-1].s_score <= Score) {
                numscores = 0;
                for (scp = Top; scp < &Top[MAXSCORES]; scp++)

-                       if (scp->s_score < 0 ||
-                           (scp->s_uid == uid && ++numscores == max_uid)) {
+                       if ((scp->s_uid == uid && ++numscores == max_uid)) {

                                if (scp->s_score > Score)
                                        break;
                                scp->s_score = Score;
                                if (scp->s_score > Score)
                                        break;
                                scp->s_score = Score;


@@ -161,7 +159,7 @@ score()
 
        if (!Newscore) {
                Full_clear = FALSE;
 
        if (!Newscore) {
                Full_clear = FALSE;

-               close(inf);
+               lseek(inf, 0, SEEK_SET);

                return;
        }
        else
                return;
        }
        else


@@ -177,9 +175,9 @@ score()
                move((scp - Top) + 2, 15);
                if (!done_show && scp->s_uid == uid && scp->s_score == Score)
                        standout();
                move((scp - Top) + 2, 15);
                if (!done_show && scp->s_uid == uid && scp->s_score == Score)
                        standout();

-               printw("%5.5d %5.5d %-8.8s %-9.9s %5.5d",
-                   (scp - Top) + 1, scp->s_score, scp->s_name,
-                   Auto_bot ? "(autobot)" : "", scp->s_level);
+               printw("%5ld %5d %-8.8s %-9.9s %5d",
+                   (long)(scp - Top) + 1, scp->s_score, scp->s_name,
+                   scp->s_auto ? "(autobot)" : "", scp->s_level);

                if (!done_show && scp->s_uid == uid && scp->s_score == Score) {
                        standend();
                        done_show = TRUE;
                if (!done_show && scp->s_uid == uid && scp->s_score == Score) {
                        standend();
                        done_show = TRUE;


@@ -191,7 +189,7 @@ score()
        if (Newscore) {
                write_score(inf);
        }
        if (Newscore) {
                write_score(inf);
        }

-       close(inf);
+       lseek(inf, 0, SEEK_SET);

 }
 
 void
 }
 
 void


@@ -239,7 +237,7 @@ show_score()
            " ", "Level");
        for (scp = Top; scp < &Top[MAXSCORES]; scp++)
                if (scp->s_score > 0)
            " ", "Level");
        for (scp = Top; scp < &Top[MAXSCORES]; scp++)
                if (scp->s_score > 0)

-                       printf("%5.5d %5.5d %-8.8s %-9.9s %5.5d\n",
+                       printf("%5d %5d %-8.8s %-9.9s %5d\n",

                            inf++, scp->s_score, scp->s_name,
                            scp->s_auto ? "(autobot)" :  "", scp->s_level);
 }
                            inf++, scp->s_score, scp->s_name,
                            scp->s_auto ? "(autobot)" :  "", scp->s_level);
 }