From 2e99c67a1bfa5c84c7c49617cae913cdb506459b Mon Sep 17 00:00:00 2001
From: christos <christos@NetBSD.org>
Date: Fri, 6 Nov 2015 19:53:37 +0000
Subject: 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":

---
 tetris/screen.c | 4 ++--
 tetris/tetris.c | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/tetris/screen.c b/tetris/screen.c
index 1babdb49..62d50a2d 100644
--- a/tetris/screen.c
+++ b/tetris/screen.c
@@ -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 @@ scr_update(void)
 		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++) {
diff --git a/tetris/tetris.c b/tetris/tetris.c
index 57ff4e5c..1f5f68b4 100644
--- a/tetris/tetris.c
+++ b/tetris/tetris.c
@@ -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 @@ elide(void)
 				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;
-- 
cgit v1.2.3-56-ge451