diff --git a/app/Game/Client/Control/Input/GamepadInput.js b/app/Game/Client/Control/Input/GamepadInput.js index 312b254..9ddef91 100644 --- a/app/Game/Client/Control/Input/GamepadInput.js +++ b/app/Game/Client/Control/Input/GamepadInput.js @@ -1,11 +1,10 @@ define([ "Game/Client/Control/Input/XyInput", "Game/Config/Settings", - "Lib/Utilities/NotificationCenter", - "Lib/Utilities/RequestAnimFrame" + "Lib/Utilities/NotificationCenter" ], -function (Parent, Settings, Nc, requestAnimFrame) { +function (Parent, Settings, Nc) { function GamepadInput(playerController) { this.playerController = playerController; diff --git a/app/Game/Client/Control/PlayerController.js b/app/Game/Client/Control/PlayerController.js index 9de126d..2125dfa 100755 --- a/app/Game/Client/Control/PlayerController.js +++ b/app/Game/Client/Control/PlayerController.js @@ -47,6 +47,7 @@ function (Parent, KeyboardInput, MouseInput, Nc, GamepadInput) { PlayerController.prototype = Object.create(Parent.prototype); PlayerController.prototype.update = function() { + Parent.prototype.update.call(this); this.gamepadInput.update(); }; diff --git a/app/Game/Client/GameController.js b/app/Game/Client/GameController.js index 5fc74a9..6121033 100755 --- a/app/Game/Client/GameController.js +++ b/app/Game/Client/GameController.js @@ -50,8 +50,6 @@ function (Parent, Box2D, PhysicsEngine, ViewManager, PlayerController, Nc, reque this.animationRequestId = requestAnimFrame(this.update.bind(this)); - if(this.me && this.me.playerController) this.me.playerController.update(); - this.physicsEngine.update(); if(this.me) {