From 8ffbee0ad4b73289b07be8fe1899bade8d08cf8f Mon Sep 17 00:00:00 2001
From: Robert Kolner <robert.kolner@gmail.com>
Date: Tue, 13 Mar 2012 01:38:28 +0100
Subject: [PATCH] Added a controller class, fixed a bug with out-of-board
 check.

---
 index.html        |  1 +
 tetris-control.js | 11 ++++++++
 tetris.js         | 67 ++++++++++++++++++++++++++++++++++++++++-------
 3 files changed, 70 insertions(+), 9 deletions(-)
 create mode 100644 tetris-control.js

diff --git a/index.html b/index.html
index d3e0e34..4d5d18f 100755
--- a/index.html
+++ b/index.html
@@ -4,6 +4,7 @@
 		<script src="utils.js"></script>
 		<script src="tetris-canvas.js"></script>
 		<script src="tetris.js"></script>
+		<script src="tetris-control.js"></script>
 		
 		<style>
 			#tetris-board {
diff --git a/tetris-control.js b/tetris-control.js
new file mode 100644
index 0000000..01e22c6
--- /dev/null
+++ b/tetris-control.js
@@ -0,0 +1,11 @@
+var game = null;
+
+function doTurn() {
+	game.doTurn();
+	window.setTimeout(doTurn, 333);
+}
+
+$(document).ready(function() {
+	game = new TetrisGame("tetris-board");
+	doTurn();
+});
\ No newline at end of file
diff --git a/tetris.js b/tetris.js
index 6e419ac..3b87796 100644
--- a/tetris.js
+++ b/tetris.js
@@ -43,6 +43,12 @@ function TetrisGame(id) {
 		return 1 + Math.floor(Math.random() * 7);
 	}
 	
+	this.resetCurrentBrick = function() {
+		this.currentBrickId = this.getRandomBrick();
+		this.currentBrickLoc = [Math.floor(this.width/2),this.height-1];
+		this.currentBrickRot = 0;
+	}
+	
 	this.currentBrickShape = function() {
 		var glob_shape = this.brickShapes[this.currentBrickId];
 		var shape = createArray(4,2);
@@ -81,12 +87,56 @@ function TetrisGame(id) {
 		}
 	}
 	
+	this.canCurrentBrickMove = function(dx,dy) {
+		var shape = this.currentBrickShape();
+		
+		for (var i = 0; i < 4; i++) {
+			var x = this.currentBrickLoc[0]+shape[i][0] + dx;
+			var y = this.currentBrickLoc[1]+shape[i][1] + dy;
+			
+			if (x < 0 || x >= this.width) { return false; }
+			if (y < 0) { return false; }
+			if (y >= this.height) { continue; }
+			
+			if (this.board[x][y] != 0) {
+				return false;
+			}
+		}
+		
+		return true;
+	}
+	
+	this.moveCurrentBrickHorizontally = function(dx) {
+		if (this.canCurrentBrickMove(dx, 0)) {
+			this.currentBrickLoc[0] += dx;
+			return true;
+		}
+		return false;
+	}
+	
+	this.moveCurrentBrickDown = function() {
+		if (this.canCurrentBrickMove(0, -1)) {
+			this.currentBrickLoc[1] -= 1;
+			return true;
+		}
+		
+		// If not, integrate into board:
+		var shape = this.currentBrickShape();
+		for (var i = 0; i < 4; i++) {
+			var x = this.currentBrickLoc[0]+shape[i][0];
+			var y = this.currentBrickLoc[1]+shape[i][1];
+
+			this.board[x][y] = this.bricks[this.currentBrickId];
+		}
+		
+		this.resetCurrentBrick();
+		return false;
+	}
+	
 	this.doTurn = function() {
 		/* Fill out */
-		this.currentBrickId = this.getRandomBrick();
-		this.currentBrickLoc = [5,5];
-		this.currentBrickRot = 0;
-	
+		this.moveCurrentBrickDown();
+		
 		this.canvas.drawBoard(this.board);
 		this.drawCurrentBrick();
 	}
@@ -100,11 +150,10 @@ function TetrisGame(id) {
 				this.board[x][y] = 0;
 			}
 		}
+		
+		this.currentBrickId = this.getRandomBrick();
+		this.currentBrickLoc = [5,5];
+		this.currentBrickRot = 0;
 	};
 	this.TetrisGame(id);
 }
-
-$(document).ready(function() {
-	var tetris = new TetrisGame("tetris-board");
-	tetris.doTurn();
-});
\ No newline at end of file