From 39d22dfc5eb0945df96585ad64ba554f17b3af29 Mon Sep 17 00:00:00 2001
From: Robert Kolner <robert.kolner@gmail.com>
Date: Fri, 23 Mar 2012 18:55:53 +0100
Subject: [PATCH] Made few some improvements with regards to future handling of
 non-standard sized boards.

---
 tetris-canvas.js | 24 +++++++++++++++++++-----
 tetris.js        | 10 ++++++----
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/tetris-canvas.js b/tetris-canvas.js
index 7112282..a267a89 100644
--- a/tetris-canvas.js
+++ b/tetris-canvas.js
@@ -1,4 +1,4 @@
-function TetrisCanvas(canvasId, width, height) {
+function TetrisCanvas(canvasId, width) {
 	/***********/
 	/* Colors: */
 	/***********/
@@ -26,14 +26,14 @@ function TetrisCanvas(canvasId, width, height) {
 
 	/* Segment-dependant: */
 	this.sWidth = width;
-	this.sHeight = height;
+	this.sHeight = -1;
 
 	/**************/
 	/* Functions: */
 	/**************/
 	this.drawRectangle = function(x, y, brickId) {
-		var topLeftCornerX = x*(this.pxSeparatorSize+this.pxRectSize);
-		var topLeftCornerY = this.pxHeight - (y + 1) * (this.pxSeparatorSize + this.pxRectSize) + this.pxSeparatorSize;
+		var topLeftCornerX = Math.floor(x*(this.pxSeparatorSize+this.pxRectSize));
+		var topLeftCornerY = Math.floor(this.pxHeight - (y + 1) * (this.pxSeparatorSize + this.pxRectSize) + this.pxSeparatorSize);
 		var color = this.colors[brickId];
 
 		this.context.beginPath();
@@ -43,7 +43,19 @@ function TetrisCanvas(canvasId, width, height) {
 
 	}
 
+	this.clearOverflow = function() {
+		var topPixel = this.pxHeight - (this.sHeight * (this.pxRectSize + this.pxSeparatorSize));
+
+		if (topPixel > 0) {
+			this.context.beginPath();
+			this.context.rect(0,0,this.pxWidth, topPixel);
+			this.context.fillStyle = this.colors[0];
+			this.context.fill();
+		}
+	}
+
 	this.drawBoard = function(board) {
+		this.clearOverflow();
 		for (var y = 0; y < this.sHeight; y++) {
 			for (var x = 0; x < this.sWidth; x++) {
 				this.drawRectangle(x,y,board[x][y]);
@@ -60,8 +72,10 @@ function TetrisCanvas(canvasId, width, height) {
 		var canvas = document.getElementById(canvasId);
 		this.pxHeight = $("#"+canvasId).height();
 		this.pxWidth = $("#"+canvasId).width();
-		this.pxRectSize = (this.pxWidth - (this.pxSeparatorSize * this.sWidth)) / (this.sWidth);
+		this.pxRectSize = Math.floor((this.pxWidth - (this.pxSeparatorSize * this.sWidth)) / (this.sWidth));
 		
+		this.sHeight = Math.floor(this.pxHeight / (this.pxRectSize + this.pxSeparatorSize));
+
 		this.context = canvas.getContext("2d");
 	}
 	
diff --git a/tetris.js b/tetris.js
index 17fb678..c2514f9 100644
--- a/tetris.js
+++ b/tetris.js
@@ -32,8 +32,10 @@ function TetrisGame(canvasId, linesCounterId, nextBricksCanvasId) {
 	this.stats = new TetrisStats();
 	
 	this.width = 10;
-	this.height = 15;
-	this.canvas = new TetrisCanvas(canvasId, this.width, this.height);
+	this.canvas = new TetrisCanvas(canvasId, this.width); 
+	this.height = this.canvas.sHeight;
+
+
 	this.lineCounterElement = 0;
 	this.nextBricksCanvas = nextBricksCanvasId ? new TetrisCanvas(nextBricksCanvasId, 5, 25) : null;
 	this.board = createArray(this.width, this.height);
@@ -358,8 +360,8 @@ function TetrisGame(canvasId, linesCounterId, nextBricksCanvasId) {
 		this.lineCounterElement = $('#' +linesCounterId);
 
 		// Initialize the board:
-		for (var y = 0; y < 15; y++) {
-			for (var x = 0; x < 10; x++) {
+		for (var y = 0; y < this.height; y++) {
+			for (var x = 0; x < this.width; x++) {
 				this.board[x][y] = 0;
 			}
 		}