Merge branch 'master' of github.com:glenux/wyrian

js/DisplayController.js

@@ -1,7 +1,8 @@
 var DisplayController = function() {
+	var that = {};
 
-
+	that.draw = function() {
-	this.draw = function() {
+		console.log("draw");
-
 	};
+	return that;
 };

js/GameController.js

@@ -1,26 +1,25 @@
 var GameController = function(inputController, displayController) {
+	var that = {};
+	that._loopRunning = false;
+	that._loop = null;
+	that._inputController = inputController;
+	that._displayController = displayController;
 
-	this._loopRunning = false;
+	that.start = function() {
-	this._loop = null;
+		that._loopRunning = true;
-	this._inputController = inputController;
+		that._loop = setInterval(that.loop, 30);
-	this._displayController = displayController;
-
-	this.start = function() {
-		this._loopRunning = true;
-		this._loop = setInterval(this.loop, 30);
 	};
 
-	this.stop = function() {
+	that.stop = function() {
-		this._loopRunning = false;
+		that._loopRunning = false;
 	};
 
-	this.loop = function() {
+	that.loop = function() {
-		this._inputController.observe();
+		that._inputController.observe();
-
 		// add other stuff here
 
-		this._displayController.draw();
+		that._displayController.draw();
 	};
 	
-
+	return that;
 };

js/InputController.js

@@ -1,7 +1,8 @@
 var InputController = function() {
+	var that = {};
 	
-	
+	that.observe = function() {
-	this.observe = function() {
+		console.log("input");
-		
 	};
+	return that;
 };