diff --git a/app/Game/Client/Control/PlayerController.js b/app/Game/Client/Control/PlayerController.js index e64f740..82db175 100755 --- a/app/Game/Client/Control/PlayerController.js +++ b/app/Game/Client/Control/PlayerController.js @@ -6,7 +6,7 @@ define([ "Game/Client/PointerLockManager" ], -function (Parent, nc, KeyboardAndMouse, Gamepad, PointerLockManager) { +function (Parent, nc, KeyboardAndMouse, Gamepad, pointerLockManager) { "use strict"; @@ -115,7 +115,7 @@ function (Parent, nc, KeyboardAndMouse, Gamepad, PointerLockManager) { * and is not in between games */ PlayerController.prototype.isPlayerInputAllowed = function() { - return PointerLockManager.isLocked() + return pointerLockManager.isLocked() && Parent.prototype.isPlayerInputAllowed.call(this); }; diff --git a/app/Game/Client/GameController.js b/app/Game/Client/GameController.js index a752cdd..9d85885 100755 --- a/app/Game/Client/GameController.js +++ b/app/Game/Client/GameController.js @@ -18,7 +18,7 @@ define([ "Lib/Utilities/Exception" ], -function (Parent, Box2D, PhysicsEngine, ViewManager, PlayerController, nc, requestAnimFrame, Settings, GameObject, Doll, domController, ProtocolHelper, Me, AudioPlayer, PointerLockManager, Assert, Exception) { +function (Parent, Box2D, PhysicsEngine, ViewManager, PlayerController, nc, requestAnimFrame, Settings, GameObject, Doll, domController, ProtocolHelper, Me, AudioPlayer, pointerLockManager, Assert, Exception) { "use strict"; @@ -244,7 +244,7 @@ function (Parent, Box2D, PhysicsEngine, ViewManager, PlayerController, nc, reque }; GameController.prototype.onLevelLoaded = function () { - PointerLockManager.update(null, {start:true}); + pointerLockManager.update(null, {start:true}); }; GameController.prototype.toggleGameStats = function(show) { diff --git a/app/Game/Client/View/DomController.js b/app/Game/Client/View/DomController.js index 12489ab..90d5f52 100755 --- a/app/Game/Client/View/DomController.js +++ b/app/Game/Client/View/DomController.js @@ -6,7 +6,7 @@ define([ "Game/Client/PointerLockManager" ], -function (Settings, nc, Screenfull, Graph, PointerLockManager) { +function (Settings, nc, Screenfull, Graph, pointerLockManager) { "use strict"; @@ -137,7 +137,7 @@ function (Settings, nc, Screenfull, Graph, PointerLockManager) { button.innerHTML = "Fullscreen"; button.onclick = function() { if(Screenfull.enabled) { - PointerLockManager.request(); + pointerLockManager.request(); Screenfull.request(self.canvas); } }; diff --git a/app/Game/Client/View/Pixi/View.js b/app/Game/Client/View/Pixi/View.js index 7696f0d..d7c7f11 100755 --- a/app/Game/Client/View/Pixi/View.js +++ b/app/Game/Client/View/Pixi/View.js @@ -14,7 +14,7 @@ define([ "Game/Client/View/Pixi/Layers/Messages" ], -function (Parent, domController, PIXI, Settings, nc, Exception, GameStats, LayerManager, Ghost, Swiper, PointerLockManager, Debug, Messages) { +function (Parent, domController, PIXI, Settings, nc, Exception, GameStats, LayerManager, Ghost, Swiper, pointerLockManager, Debug, Messages) { "use strict"; @@ -231,7 +231,7 @@ function (Parent, domController, PIXI, Settings, nc, Exception, GameStats, Layer this.renderer.resize(window.innerWidth, window.innerHeight); this.currentZoom = window.innerWidth / 600; - PointerLockManager.update(null, {}); // only to reposition clickToEnable text + pointerLockManager.update(null, {}); // only to reposition clickToEnable text }; PixiView.prototype.initLoader = function() { diff --git a/app/Menu/Menu.js b/app/Menu/Menu.js index e3dffd3..111dcfe 100644 --- a/app/Menu/Menu.js +++ b/app/Menu/Menu.js @@ -6,7 +6,7 @@ define([ "Lib/Utilities/QuerySelector" ], -function (Settings, ColorConverter, Exception, PointerLockManager, Qs) { +function (Settings, ColorConverter, Exception, pointerLockManager, Qs) { "use strict"; @@ -404,7 +404,7 @@ function (Settings, ColorConverter, Exception, PointerLockManager, Qs) { clearInterval(instance.channelDestructionTimeout); } - PointerLockManager.request(); + pointerLockManager.request(); } } @@ -427,7 +427,7 @@ function (Settings, ColorConverter, Exception, PointerLockManager, Qs) { } Qs.$("#canvas").onclick = function(){ - PointerLockManager.request(); + pointerLockManager.request(); }; return Menu;