wbrawner/hextris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed issue in which blocks were added twice (init was called twice)

Browse source
This commit is contained in:
lengstrom 2014-06-24 09:23:43 -04:00
parent 04c553d46d
commit 0715056fe0
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
js/main.js
View file

@ -3,6 +3,7 @@ var showingHelp = false;
$(document).ready(function(){
scaleCanvas();
$('#startBtn').on('touchstart mousedown', function(){
gameState = 1;
setTimeout(function(){
document.body.addEventListener('mousedown', function(e) {
handleClickTap(e.clientX);
@ -140,6 +141,7 @@ var gameState;
setStartScreen();
function init() {
console.log('o');
$('#pauseBtn').hide();
$('#startBtn').hide();
var saveState = localStorage.getItem("saveState") || "{}";
@ -183,7 +185,7 @@ function init() {
for(i=0; i<MainClock.blocks.length; i++) {
for(var j=0; j<MainClock.blocks[i].length; j++) {
MainClock.blocks[i][j].height = settings.blockHeight;
MainClock.blocks[i][j].height = settings.blockHeight;
block = MainClock.blocks[i][j];
block.distFromHex = 2 * MainClock.sideLength / Math.sqrt(3) + (j-1) * block.height;
block.settled = 0;
@ -198,6 +200,7 @@ function init() {
MainClock.texts = []; //clear texts
hideText();
debugger;
}
function addNewBlock(blocklane, color, iter, distFromHex, settled) { //last two are optional parameters

3
js/save-state.js
View file

@ -1,8 +1,9 @@
function exportSaveState() {
console.log('o')
var state = {};
if(gameState == 1 || gameState == -1 || (gameState == 0 && localStorage.getItem('saveState') !== undefined)) {
MainClock.blocks.map(function(block){block.distFromHex /= settings.scale});
MainClock.blocks.map(function(block){block.distFromHex /= settings.scale});
blocks.map(function(block){block.distFromHex /= settings.scale})
state = {
clock: MainClock,