 @@ -1,14 +1,14 @@
-/*	$NetBSD: screen.c,v 1.31 2015/11/06 19:53:37 christos Exp $	*/
+/*	$NetBSD: screen.c,v 1.32 2016/03/03 21:38:55 nat 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.
 @@ -187,26 +187,27 @@ scr_set(void)
 		Rows = ws.ws_row;
 		Cols = ws.ws_col;
+	}
 	if (Rows == 0)
 		Rows = lines;
 	if (Cols == 0)
 	    Cols = columns;
 	if (Rows < MINROWS || Cols < MINCOLS) {
 		(void) fprintf(stderr,
 		    "the screen is too small: must be at least %dx%d, ",
 		    MINCOLS, MINROWS);
 		stop("");	/* stop() supplies \n */
+	}
 	Offset = (Rows - D_LAST + D_FIRST - 2) / 2;
 	if (tcgetattr(0, &oldtt) < 0)
 		stop("tcgetattr() fails");
 	newtt = oldtt;
 	newtt.c_lflag &= ~(ICANON|ECHO);
 	newtt.c_oflag &= ~OXTABS;
 	if (tcsetattr(0, TCSADRAIN, &newtt) < 0)
 		stop("tcsetattr() fails");
 	ospeed = cfgetospeed(&newtt);
 	(void) sigprocmask(SIG_BLOCK, &nsigset, &osigset);
 	/*
 	 * We made it.  We are now in screen mode, modulo TIstr
 	 * (which we will fix immediately).
 @@ -350,27 +351,27 @@ scr_update(void)
 	bp = &board[D_FIRST * B_COLS];
 	sp = &curscreen[D_FIRST * B_COLS];
 	for (j = D_FIRST; j < D_LAST; j++) {
 		ccol = -1;
 		for (i = 0; i < B_COLS; bp++, sp++, i++) {
 			if (*sp == (so = *bp))
 				continue;
 			*sp = so;
 			if (i != ccol) {
 				if (cur_so && move_standout_mode) {
 					putpad(exit_standout_mode);
 					cur_so = 0;
+				}
-				moveto(RTOD(j), CTOD(i));
+				moveto(RTOD(j + Offset), CTOD(i));
+			}
 			if (enter_standout_mode) {
 				if (so != cur_so) {
 					setcolor(so);
 					putpad(so ?
 					    enter_standout_mode :
 					    exit_standout_mode);
 					cur_so = so;
+				}
 #ifdef DEBUG
 				char buf[3];
 				snprintf(buf, sizeof(buf), "%d%d", so, so);
 				putstr(buf);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: tetris.c,v 1.31 2015/11/06 19:53:37 christos Exp $	*/
+/*	$NetBSD: tetris.c,v 1.32 2016/03/03 21:38:55 nat 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.
 @@ -52,26 +52,27 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 19
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include "input.h"
 #include "scores.h"
 #include "screen.h"
 #include "tetris.h"
 cell	board[B_SIZE];		/* 1 => occupied, 0 => empty */
 int	Rows, Cols;		/* current screen size */
 int	Offset;			/* used to center board & shapes */
 static 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;
 int	nocolor;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: tetris.h,v 1.14 2014/07/13 16:23:55 pgoyette Exp $	*/
+/*	$NetBSD: tetris.h,v 1.15 2016/03/03 21:38:55 nat 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.
 @@ -63,26 +63,27 @@ extern cell	board[B_SIZE];	/* 1 => occup
 #define	D_LAST	22
 	/* the active area (rows) */
 #define	A_FIRST	1
 #define	A_LAST	21
 /*
  * Minimum display size.
  */
 #define	MINROWS	23
 #define	MINCOLS	40
 extern int	Rows, Cols;	/* current screen size */
 extern int	Offset;		/* vert. offset to center board */
 /*
  * Translations from board coordinates to display coordinates.
  * As with board coordinates, display coordiates are zero origin.
  */
 #define	RTOD(x)	((x) - 1)
 #define	CTOD(x)	((x) * 2 + (((Cols - 2 * B_COLS) >> 1) - 1))
 /*
  * A `shape' is the fundamental thing that makes up the game.  There
  * are 7 basic shapes, each consisting of four `blots':
+ *
  *	X.X	  X.X		X.X