Sort and remove duplicates.

[bsdgames-darwin.git] / tetris / tetris.c

diff --git a/tetris/tetris.c b/tetris/tetris.c
index f00fb7d795c5b0f0266fc39ef4b0281df2365d13..24204132d26fc39013908b875e3fb965fae577b8 100644 (file)
--- a/tetris/tetris.c
+++ b/tetris/tetris.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: tetris.c,v 1.7 1999/01/03 17:13:51 hubertf Exp $       */
+/*     $NetBSD: tetris.c,v 1.15 2002/06/02 22:17:38 wiz Exp $  */

 
 /*-
  * Copyright (c) 1992, 1993
 
 /*-
  * Copyright (c) 1992, 1993


@@ -50,6 +50,8 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 1993\n\
 
 #include <sys/time.h>
 
 
 #include <sys/time.h>
 

+#include <err.h>
+#include <fcntl.h>

 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>


@@ -61,6 +63,21 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 1993\n\
 #include "screen.h"
 #include "tetris.h"
 
 #include "screen.h"
 #include "tetris.h"
 

+cell   board[B_SIZE];          /* 1 => occupied, 0 => empty */
+
+int    Rows, Cols;             /* current screen size */
+
+const struct shape *curshape;
+const struct shape *nextshape;
+
+long   fallrate;               /* less than 1 million; smaller => faster */
+
+int    score;                  /* the obvious thing */
+gid_t  gid, egid;
+
+char   key_msg[100];
+int    showpreview;
+

 static void    elide __P((void));
 static void    setup_board __P((void));
        int     main __P((int, char **));
 static void    elide __P((void));
 static void    setup_board __P((void));
        int     main __P((int, char **));


@@ -75,16 +92,12 @@ static      void    setup_board __P((void));
 static void
 setup_board()
 {
 static void
 setup_board()
 {

-       register int i;
-       register cell *p;
+       int i;
+       cell *p;

 
        p = board;
        for (i = B_SIZE; i; i--)
 
        p = board;
        for (i = B_SIZE; i; i--)

-#ifndef mips

                *p++ = i <= (2 * B_COLS) || (i % B_COLS) < 2;
                *p++ = i <= (2 * B_COLS) || (i % B_COLS) < 2;

-#else /* work around compiler bug */
-               *p++ = i <= (2 * B_COLS) || (i % B_COLS) < 2 ? 1 : 0;
-#endif

 }
 
 /*
 }
 
 /*


@@ -93,8 +106,8 @@ setup_board()
 static void
 elide()
 {
 static void
 elide()
 {

-       register int i, j, base;
-       register cell *p;
+       int i, j, base;
+       cell *p;

 
        for (i = A_FIRST; i < A_LAST; i++) {
                base = i * B_COLS + 1;
 
        for (i = A_FIRST; i < A_LAST; i++) {
                base = i * B_COLS + 1;


@@ -120,11 +133,21 @@ main(argc, argv)
        int argc;
        char *argv[];
 {
        int argc;
        char *argv[];
 {

-       register int pos, c;
-       register char *keys;
-       register int level = 2;
+       int pos, c;
+       const char *keys;
+       int level = 2;

        char key_write[6][10];
        int ch, i, j;
        char key_write[6][10];
        int ch, i, j;

+       int fd;
+
+       gid = getgid();
+       egid = getegid();
+       setegid(gid);
+
+       fd = open("/dev/null", O_RDONLY);
+       if (fd < 3)
+               exit(1);
+       close(fd);

 
        keys = "jkl pq";
 
 
        keys = "jkl pq";
 


@@ -137,10 +160,8 @@ main(argc, argv)
                case 'l':
                        level = atoi(optarg);
                        if (level < MINLEVEL || level > MAXLEVEL) {
                case 'l':
                        level = atoi(optarg);
                        if (level < MINLEVEL || level > MAXLEVEL) {

-                               (void)fprintf(stderr,
-                                   "tetris: level must be from %d to %d",
-                                   MINLEVEL, MAXLEVEL);
-                               exit(1);
+                               errx(1, "level must be from %d to %d",
+                                    MINLEVEL, MAXLEVEL);

                        }
                        break;
                case 'p':
                        }
                        break;
                case 'p':


@@ -165,10 +186,7 @@ main(argc, argv)
        for (i = 0; i <= 5; i++) {
                for (j = i+1; j <= 5; j++) {
                        if (keys[i] == keys[j]) {
        for (i = 0; i <= 5; i++) {
                for (j = i+1; j <= 5; j++) {
                        if (keys[i] == keys[j]) {

-                               (void)fprintf(stderr,
-                                   "%s: Duplicate command keys specified.\n",
-                                   argv[0]);
-                               exit (1);
+                               errx(1, "duplicate command keys specified.");

                        }
                }
                if (keys[i] == ' ')
                        }
                }
                if (keys[i] == ' ')


@@ -262,7 +280,7 @@ main(argc, argv)
                }
                if (c == keys[1]) {
                        /* turn */
                }
                if (c == keys[1]) {
                        /* turn */

-                       struct shape *new = &shapes[curshape->rot];
+                       const struct shape *new = &shapes[curshape->rot];

 
                        if (fits_in(new, pos))
                                curshape = new;
 
                        if (fits_in(new, pos))
                                curshape = new;


@@ -308,7 +326,7 @@ main(argc, argv)
 
 void
 onintr(signo)
 
 void
 onintr(signo)

-       int signo;
+       int signo __attribute__((__unused__));

 {
        scr_clear();
        scr_end();
 {
        scr_clear();
        scr_end();


@@ -318,6 +336,6 @@ onintr(signo)
 void
 usage()
 {
 void
 usage()
 {

-       (void)fprintf(stderr, "usage: tetris [-ps] [-l level] [-keys]\n");
+       (void)fprintf(stderr, "usage: tetris [-ps] [-k keys] [-l level]\n");

        exit(1);
 }
        exit(1);
 }