Fri Nov 6 19:53:37 2015 UTC ()

PR/50411: Rin Okuyama: fix two bugs:
- clear blocks in the 0 row, otherwise the pile up forever.
- black (white) blocks are not shown as "next shape":


(christos)

diff -r1.30 -r1.31 src/games/tetris/screen.c
diff -r1.30 -r1.31 src/games/tetris/tetris.c

--- src/games/tetris/screen.c 2015/07/07 22:53:25	1.30
+++ src/games/tetris/screen.c 2015/11/06 19:53:37	1.31

 @@ -1,14 +1,14 @@
-/*	$NetBSD: screen.c,v 1.30 2015/07/07 22:53:25 nat Exp $	*/
+/*	$NetBSD: screen.c,v 1.31 2015/11/06 19:53:37 christos Exp $	*/
 /*-
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Chris Torek and Darren F. Provine.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -320,28 +320,28 @@ scr_update(void)
 		lastshape = nextshape;
 		/* clean */
 		putpad(exit_standout_mode);
 		moveto(r-1, c-1); putstr("          ");
 		moveto(r,   c-1); putstr("          ");
 		moveto(r+1, c-1); putstr("          ");
 		moveto(r+2, c-1); putstr("          ");
 		moveto(r-3, c-2);
 		putstr("Next shape:");
 		/* draw */
 		putpad(enter_standout_mode);
 		setcolor(nextshape->color);
 		putpad(enter_standout_mode);
 		moveto(r, 2*c);
 		putstr("  ");
 		for(i=0; i<3; i++) {
 			t = c + r*B_COLS;
 			t += nextshape->off[i];
 			tr = t / B_COLS;
 			tc = t % B_COLS;
 			moveto(tr, 2*tc);
 			putstr("  ");
+		}
 		putpad(exit_standout_mode);

--- src/games/tetris/tetris.c 2015/06/13 04:53:13	1.30
+++ src/games/tetris/tetris.c 2015/11/06 19:53:37	1.31

 @@ -1,14 +1,14 @@
-/*	$NetBSD: tetris.c,v 1.30 2015/06/13 04:53:13 dholland Exp $	*/
+/*	$NetBSD: tetris.c,v 1.31 2015/11/06 19:53:37 christos Exp $	*/
 /*-
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Chris Torek and Darren F. Provine.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -106,26 +106,28 @@ elide(void)
 	cell *p;
 	for (i = A_FIRST; i < A_LAST; i++) {
 		base = i * B_COLS + 1;
 		p = &board[base];
 		for (j = B_COLS - 2; *p++ != 0;) {
 			if (--j <= 0) {
 				/* this row is to be elided */
 				memset(&board[base], 0, B_COLS - 2);
 				scr_update();
 				tsleep();
 				while (--base != 0)
 					board[base + B_COLS] = board[base];
 				/* don't forget to clear 0th row */
 				memset(&board[1], 0, B_COLS - 2);
 				scr_update();
 				tsleep();
 				break;
+			}
+		}
+	}
+}
 int
 main(int argc, char *argv[])
+{
 	int pos, c;
 	const char *keys;