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,4 +1,4 @@
-/*	$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
@@ -330,8 +330,8 @@
 		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++) {

--- 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,4 +1,4 @@
-/*	$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
@@ -116,6 +116,8 @@
 				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;