Merge branch 'clay-improvements' of https://github.com/Hextris/hextris into clay-improvements

This commit is contained in:
lengstrom 2015-03-14 14:17:10 -04:00
commit 9eecb2746a

View file

@ -65,9 +65,12 @@ function addKeyListeners() {
keypress.register_combo({ keypress.register_combo({
keys: "enter", keys: "enter",
on_keydown: function() { on_keydown: function() {
if (gameState==2 || gameState==1 || importing == 1) { if (gameState==1 || importing == 1) {
init(1); init(1);
} }
if (gameState == 2) {
init();
}
if (gameState===0) { if (gameState===0) {
resumeGame(); resumeGame();
} }