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

fixed the whole weird stuff

Browse source
This commit is contained in:
Garrett Finucane 2014-06-24 13:16:46 -04:00
parent 38164ebe1f
commit f6b56382cf
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
js/input.js
View file

@ -100,7 +100,7 @@ keypress.register_combo({
if (gameState==2 || gameState==1) {
init(1);
}
if (gameState==0){ gameState=1}
if (gameState==0){ init();}
}
});
@ -124,13 +124,13 @@ function handleClickTap(x) {
if (x < window.innerWidth/2) {
if (gameState != 1 && gameState != -2 && gameState != -1 ){
gameState=1;
init();
}
MainClock.rotate(1);
}
if (x > window.innerWidth/2) {
if (gameState != 1 && gameState != -2 && gameState != -1) {
gameState=1;
init();
}
MainClock.rotate(-1);
}

4
js/main.js
View file

@ -240,7 +240,7 @@ function importHistory(j) {
alert("Error importing JSON");
}
} else {
init(1);
init();
importing = 1;
importedHistory = j;
}
@ -266,11 +266,11 @@ function stepInitialLoad() {
}
function setStartScreen() {
init();
$('#startBtn').show();
if (!isStateSaved()) {
importHistory(introJSON);
} else {
init();
importing = 0;
}
gameState = 0;