Hides playercontroller within player

In order to not provide deep exposure to PlayerController,
we refactored it so that it is not visible anymore outside Player.

Also we renamed isInBetweenGames to inBetweenRounds.

Moved creation of PlayerController from GameController(s) to
The channel Player and client Me.

app/Game/Channel/GameController.js

@@ -2,7 +2,6 @@ define([
     "Game/Core/GameController",
     "Game/Channel/Physics/Engine",
     "Game/Config/Settings", 
-    "Game/Channel/Control/PlayerController",
     "Lib/Utilities/RequestAnimFrame",
     "Lib/Utilities/NotificationCenter",
     "Lib/Vendor/Box2D",
@@ -12,7 +11,7 @@ define([
     "Game/Channel/GameObjects/Items/RubeDoll"
 ],
 
-function (Parent, PhysicsEngine, Settings, PlayerController, requestAnimFrame, Nc, Box2D, Player, GameObject, Doll, RubeDoll) {
+function (Parent, PhysicsEngine, Settings, requestAnimFrame, Nc, Box2D, Player, GameObject, Doll, RubeDoll) {
 
 	"use strict";
 
@@ -62,7 +61,6 @@ function (Parent, PhysicsEngine, Settings, PlayerController, requestAnimFrame, N
 
     GameController.prototype.createPlayer = function(user) {
         var player = Parent.prototype.createPlayer.call(this, user);
-        player.setPlayerController(new PlayerController(player))
         user.setPlayer(player);
     };
 
@@ -219,7 +217,7 @@ function (Parent, PhysicsEngine, Settings, PlayerController, requestAnimFrame, N
         this.roundHasEnded = true;
 
         for(var id in this.players) {
-            this.players[id].getPlayerController().setIsInBetweenGames(true);
+            this.players[id].setInBetweenRounds(true);
         }
     };
 

app/Game/Channel/Player.js

@@ -1,14 +1,17 @@
 define([
 	"Game/Core/Player",
-	"Lib/Utilities/NotificationCenter"
+	"Lib/Utilities/NotificationCenter",
+    "Game/Channel/Control/PlayerController"
 ],
  
-function (Parent, Nc) {
+function (Parent, Nc, PlayerController) {
 
 	"use strict";
  
     function Player(id, physicsEngine, user) {
     	Parent.call(this, id, physicsEngine, user);
+
+        this.playerController = new PlayerController(this);
     }
 
     Player.prototype = Object.create(Parent.prototype);

app/Game/Client/GameController.js

@@ -151,7 +151,6 @@ function (Parent, Box2D, PhysicsEngine, ViewManager, PlayerController, Nc, reque
     };
 
     GameController.prototype.setMe = function() {
-        this.me.setPlayerController(new PlayerController(this.me));
         this.view.setMe(this.me);
     };
 
@@ -257,13 +256,11 @@ function (Parent, Box2D, PhysicsEngine, ViewManager, PlayerController, Nc, reque
     };
 
     GameController.prototype.beginRound = function() {
-        if (this.me.getPlayerController()) {
+        this.me.setInBetweenRounds(false);
-            this.me.getPlayerController().setIsInBetweenGames(false);
-        }
     };
 
     GameController.prototype.endRound = function() {
-        this.me.getPlayerController().setIsInBetweenGames(true);
+        this.me.setInBetweenRounds(true);
         this.toggleGameStats(true);
     };
 

app/Game/Client/Me.js

@@ -2,10 +2,11 @@ define([
 	"Game/Client/Player",
 	"Game/Config/Settings",
     "Lib/Utilities/NotificationCenter",
-    "Lib/Utilities/Assert"
+    "Lib/Utilities/Assert",
+    "Game/Client/Control/PlayerController",
 ],
  
-function (Parent, Settings, Nc, Assert) {
+function (Parent, Settings, Nc, Assert, PlayerController) {
 
 	"use strict";
  
@@ -27,6 +28,7 @@ function (Parent, Settings, Nc, Assert) {
 
         this.arrowMesh = null;
         this.createAndAddArrow();
+        this.playerController = new PlayerController(this);
     }
 
     Me.prototype = Object.create(Parent.prototype);

app/Game/Client/Player.js

@@ -8,7 +8,7 @@ function (Parent, Nc, Settings) {
 
 	"use strict";
  
-    function Player(id, physicsEngine, user) {
+    function Player(id, physicsEngine, user, isMe) {
     	Parent.call(this, id, physicsEngine, user);
 
     	this.healthBarView = null;

app/Game/Core/Control/PlayerController.js

@@ -11,7 +11,7 @@ function () {
         this._isJumping;
         this._walkingDirectionStatus = 0;
 
-        this.isInBetweenGames = false;
+        this.inBetweenRounds = false;
     }
 
     PlayerController.prototype.moveLeft = function () {
@@ -46,12 +46,12 @@ function () {
         if(options) this.player.lookAt(options.x, options.y);
     }
 
-    PlayerController.prototype.setIsInBetweenGames = function(isInBetweenGames) {
+    PlayerController.prototype.setInBetweenRounds = function(inBetweenRounds) {
-        this.isInBetweenGames = !!isInBetweenGames;
+        this.inBetweenRounds = !!inBetweenRounds;
     };
 
     PlayerController.prototype.isPlayerInputAllowed = function() {
-        return !this.isInBetweenGames;
+        return !this.inBetweenRounds;
     };
 
     PlayerController.prototype.update = function () {

app/Game/Core/Player.js

@@ -1,5 +1,6 @@
 define([
     "Game/" + GLOBALS.context + "/GameObjects/Doll",
+    "Game/" + GLOBALS.context + "/Control/PlayerController",
     "Game/Config/Settings",
     "Lib/Utilities/NotificationCenter",
     "Lib/Utilities/Exception",
@@ -8,7 +9,7 @@ define([
     "Game/" + GLOBALS.context + "/GameObjects/Items/RubeDoll"
 ],
 
-function (Doll, Settings, Nc, Exception, ColorConverter, SpectatorDoll, RubeDoll) {
+function (Doll, PlayerController, Settings, Nc, Exception, ColorConverter, SpectatorDoll, RubeDoll) {
 
 	"use strict";
 
@@ -21,7 +22,7 @@ function (Doll, Settings, Nc, Exception, ColorConverter, SpectatorDoll, RubeDoll
 
         this.user = user;
         this.physicsEngine = physicsEngine;
-        this.playerController = null;
+        this.playerController = null; // pre-initialise with null, because client/players don't get one
         this.doll;
         this.id = id;
         this.spawned = false;
@@ -183,13 +184,9 @@ function (Doll, Settings, Nc, Exception, ColorConverter, SpectatorDoll, RubeDoll
         }
     }
 
-    Player.prototype.setPlayerController = function(playerController) {
+    Player.prototype.setInBetweenRounds = function(inBetweenRounds) {
-        this.playerController = playerController;
+        return this.playerController.setInBetweenRounds(inBetweenRounds);
-    }
+    };
-
-    Player.prototype.getPlayerController = function() {
-        return this.playerController;
-    }
 
     return Player;
 });