Fixed hold piece bug and issues with vanish zone

dwyfl · Mar 21, 2012 · e1dcc26 · e1dcc26
1 parent 110a82c
commit e1dcc26
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/www/css/style.css b/www/css/style.css
@@ -315,6 +315,10 @@ em.self { /* your name */
 	width: 192px;
 	height: 2px;
 	overflow: hidden;
+	display: none;
+}
+.self .toprow-wrapper {
+	display: block;
 }
 .row {
 	float: left;

diff --git a/www/js/player.js b/www/js/player.js
@@ -264,7 +264,7 @@ Player.prototype.setCurrentBlock = function(block) {
 }
 
 Player.prototype.hold = function() {
-	if (this.holdPossible) {
+	if (this.holdPossible && this.currentBlock) {
 		this.holdPossible = false;
 		if (this.holdBlock) {
 			var newBlock = this.holdBlock;

diff --git a/www/js/playerview.js b/www/js/playerview.js
@@ -101,12 +101,12 @@ PlayerView.prototype.render = function() {
 	// update board
 	var toprow = '';
 	if(this.isPlayer) {
-		toprow += '<div class="row">';
+		toprow += '<div class="toprow-wrapper"><div class="row">';
 		for(x = 0; x < this.player.width; ++x) {
 			b = this.player.at(x,Board.VANISH_ZONE_HEIGHT-1);
 			toprow += '<div class="cell '+(b !== 0 ? (typeof b === 'string' ? 'special special-'+b : 'block block-'+b) : 'empty')+'"> </div>';
 		}
-		toprow += '</div>';
+		toprow += '</div></div>';
 	}
 	for(y = Board.VANISH_ZONE_HEIGHT; y < this.player.height; ++y) {
 		html += '<div class="row">';
@@ -116,7 +116,7 @@ PlayerView.prototype.render = function() {
 		}
 		html += '</div>';
 	}
-	this.el.find('.board').html('<div class="toprow-wrapper">'+toprow+'</div><div class="board-wrapper">'+html+'</div>');
+	this.el.find('.board').html(toprow+'<div class="board-wrapper">'+html+'</div>');
 
 	if(!this.isPlayer)
 		return;

diff --git a/www/js/specials.js b/www/js/specials.js
@@ -217,7 +217,7 @@ Special.registerSpecial(
 						}
 					}
 					for(var i = 0; i < around.length; ++i) {
-						var yy = 6 + Math.floor(Math.random() * (player.height - 6));
+						var yy = Board.VANISH_ZONE_HEIGHT + 6 + Math.floor(Math.random() * (player.height - Board.VANISH_ZONE_HEIGHT - 6));
 						var xx = Math.floor(Math.random() * player.width);
 						player.data[yy*player.width + xx] = around[i];
 					}
@@ -236,7 +236,7 @@ Special.registerSpecial(
 	function(player, msg) {
 		if(msg.data) {
 			player.data = msg.data;
-			for(var y = 0; y < 5; ++y) {
+			for(var y = 0; y < Board.VANISH_ZONE_HEIGHT + 6; ++y) {
 				for(var x = 0; x < player.width; ++x) {
 					player.data[y * player.width + x] = 0;
 				}
@@ -421,7 +421,7 @@ Special.registerSpecial(
 				for(var x = 0; x < player.width; ++x)
 					player.data[y * player.width + x] = player.data[y * player.width + x] ? 0 : 1 + Math.floor(Math.random() * Block.blockData.length);
 				player.emit(Board.EVENT_CHANGE);
-				if(--y >= 6)
+				if(--y >= Board.VANISH_ZONE_HEIGHT + 6)
 					setTimeout(invertRow, 50);
 			}
 		}