From f6b56382cf99c7668819b0e1d82451dede45216e Mon Sep 17 00:00:00 2001
From: Garrett Finucane <garrettdreyfus@gmail.com>
Date: Tue, 24 Jun 2014 13:16:46 -0400
Subject: [PATCH] fixed the whole weird stuff

---
 js/input.js | 6 +++---
 js/main.js  | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/js/input.js b/js/input.js
index 4faa0e8..99a325c 100644
--- a/js/input.js
+++ b/js/input.js
@@ -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);
     }
diff --git a/js/main.js b/js/main.js
index 0a5def6..59c9349 100644
--- a/js/main.js
+++ b/js/main.js
@@ -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;