Security is square, gaming is hip,

so extend the Valhalla Rampage to where it really matters.

Tedu 118 lines of dead code containing 77 dead magic numbers,
rotting in the tree since June 24, 2001.

Spotted by and ok jsg@, ok sthen@.

diff --git a/games/backgammon/common_source/back.h b/games/backgammon/common_source/back.h
index cd5bc06..06c8417 100644 (file)
--- a/games/backgammon/common_source/back.h
+++ b/games/backgammon/common_source/back.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: back.h,v 1.12 2013/08/29 20:22:10 naddy Exp $ */
+/*     $OpenBSD: back.h,v 1.13 2014/04/25 20:23:37 schwarze Exp $      */
 
 /*
  * Copyright (c) 1980, 1993
@@ -167,7 +167,6 @@ int rsetbrd(void);
 void   save(int);
 int    text(const char *const *);
 void   wrboard(void);
-void   wrbsub(void);
 void   wrhit(int);
 void   wrscore(void);
 int    yorn(char);

diff --git a/games/backgammon/common_source/board.c b/games/backgammon/common_source/board.c
index a0802e1..240e04f 100644 (file)
--- a/games/backgammon/common_source/board.c
+++ b/games/backgammon/common_source/board.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: board.c,v 1.8 2009/10/27 23:59:23 deraadt Exp $       */
+/*     $OpenBSD: board.c,v 1.9 2014/04/25 20:23:37 schwarze Exp $      */
 
 /*
  * Copyright (c) 1980, 1993
@@ -31,134 +31,11 @@
 
 #include "back.h"
 
-static int i, j, k;
-static char ln[60];
-
 void
 wrboard()
 {
-       int     l;
-       static const char bl[] =
-       "|                       |   |                       |\n";
-       static const char sv[] =
-       "|                       |   |                       |    \n";
-
        clear();
-
        fboard();
-       goto lastline;
-       addstr("_____________________________________________________\n");
-       addstr(bl);
-       strlcpy(ln, bl, sizeof ln);
-       for (j = 1; j < 50; j += 4) {
-               k = j / 4 + (j > 24 ? 12 : 13);
-               ln[j + 1] = k % 10 + '0';
-               ln[j]     = k / 10 + '0';
-               if (j == 21)
-                       j += 4;
-       }
-       addstr(ln);
-       for (i = 0; i < 5; i++) {
-               strlcpy(ln, sv, sizeof ln);
-               for (j = 1; j < 50; j += 4) {
-                       k = j / 4 + (j > 24 ? 12 : 13);
-                       wrbsub();
-                       if (j == 21)
-                               j += 4;
-               }
-               if (-board[25] > i)
-                       ln[26] = 'w';
-               if (-board[25] > i + 5)
-                       ln[25] = 'w';
-               if (-board[25] > i + 10)
-                       ln[27] = 'w';
-               l = 53;
-               if (off[1] > i || (off[1] < 0 && off[1] + 15 > i)) {
-                       ln[54] = 'r';
-                       l = 55;
-               }
-               if (off[1] > i + 5 || (off[1] < 0 && off[1] + 15 > i + 5)) {
-                       ln[55] = 'r';
-                       l = 56;
-               }
-               if (off[1] > i + 10 || (off[1] < 0 && off[1] + 15 > i + 10)) {
-                       ln[56] = 'r';
-                       l = 57;
-               }
-               ln[l++] = '\n';
-               ln[l] = '\0';
-               addstr(ln);
-       }
-       strlcpy(ln, bl, sizeof ln);
-       ln[25] = 'B';
-       ln[26] = 'A';
-       ln[27] = 'R';
-       addstr(ln);
-       strlcpy(ln, sv, sizeof ln);
-       for (i = 4; i > -1; i--) {
-               for (j = 1; j < 50; j += 4) {
-                       k = ((j > 24 ? 53 : 49) - j) / 4;
-                       wrbsub();
-                       if (j == 21)
-                               j += 4;
-               }
-               if (board[0] > i)
-                       ln[26] = 'r';
-               if (board[0] > i + 5)
-                       ln[25] = 'r';
-               if (board[0] > i + 10)
-                       ln[27] = 'r';
-               l = 53;
-               if (off[0] > i || (off[0] < 0 && off[0] + 15 > i)) {
-                       ln[54] = 'w';
-                       l = 55;
-               }
-               if (off[0] > i + 5 || (off[0] < 0 && off[0] + 15 > i + 5)) {
-                       ln[55] = 'w';
-                       l = 56;
-               }
-               if (off[0] > i + 10 || (off[0] < 0 && off[0] + 15 > i + 10)) {
-                       ln[56] = 'w';
-                       l = 57;
-               }
-               ln[l++] = '\n';
-               ln[l] = '\0';
-               addstr(ln);
-       }
-       strlcpy(ln, bl, sizeof ln);
-       for (j = 1; j < 50; j += 4) {
-               k = ((j > 24 ? 53 : 49) - j) / 4;
-               ln[j + 1] = k % 10 + '0';
-               if (k > 9)
-                       ln[j] = k / 10 + '0';
-               if (j == 21)
-                       j += 4;
-       }
-       addstr(ln);
-       addstr("|_______________________|___|_______________________|\n");
-
-lastline:
        gwrite();
        move(18, 0);
 }
-
-void
-wrbsub()
-{
-       int     m;
-       char    d;
-
-       if (board[k] > 0) {
-               m = board[k];
-               d = 'r';
-       } else {
-               m = -board[k];
-               d = 'w';
-       }
-       if (m > i)
-               ln[j + 1] = d;
-       if (m > i + 5)
-               ln[j] = d;
-       if (m > i + 10)
-               ln[j + 2] = d;
-}