From 907ef49a53c683dc5a43a5c7b9063b28951c1061 Mon Sep 17 00:00:00 2001
From: logsol <fartman@gmx.de>
Date: Mon, 9 Dec 2013 16:48:37 +0100
Subject: [PATCH] checked paths for inheritance in client

---
 app/Game/Client/Collision/Detector.js    | 6 +++---
 app/Game/Client/Control/KeyboardInput.js | 6 +++++-
 app/Game/Client/GameController.js        | 4 ++--
 app/Game/Client/Networker.js             | 2 +-
 app/Game/Client/User.js                  | 9 +++++++++
 app/Game/Client/View/CameraController.js | 7 ++++++-
 app/Game/Client/View/DomController.js    | 6 +++++-
 app/Game/Core/Collision/Detector.js      | 5 ++---
 8 files changed, 33 insertions(+), 12 deletions(-)
 create mode 100644 app/Game/Client/User.js

diff --git a/app/Game/Client/Collision/Detector.js b/app/Game/Client/Collision/Detector.js
index 3ed456e..568bae2 100755
--- a/app/Game/Client/Collision/Detector.js
+++ b/app/Game/Client/Collision/Detector.js
@@ -1,9 +1,9 @@
 define([
-    "Lib/Vendor/Box2D", 
-    "Game/Core/Collision/Detector"
+    "Game/Core/Collision/Detector",
+    "Lib/Vendor/Box2D"
 ], 
 
-function (Box2D, Parent) {
+function (Parent, Box2D) {
 
     function Detector (player) {
         Parent.call(this, player);
diff --git a/app/Game/Client/Control/KeyboardInput.js b/app/Game/Client/Control/KeyboardInput.js
index 5f2999d..8044d4f 100755
--- a/app/Game/Client/Control/KeyboardInput.js
+++ b/app/Game/Client/Control/KeyboardInput.js
@@ -1,4 +1,8 @@
-define(["Game/Client/Control/Key"], function (Key) {
+define([
+    "Game/Client/Control/Key"
+], 
+
+function (Key) {
 
     function KeyboardInput (playerController) {
 
diff --git a/app/Game/Client/GameController.js b/app/Game/Client/GameController.js
index 7220705..10a772d 100755
--- a/app/Game/Client/GameController.js
+++ b/app/Game/Client/GameController.js
@@ -1,6 +1,6 @@
 define([
-    "Lib/Vendor/Box2D",
     "Game/Core/GameController",
+    "Lib/Vendor/Box2D",
     "Game/Client/Physics/Engine", 
     "Game/Client/View/ViewController", 
     "Game/Client/Control/PlayerController", 
@@ -10,7 +10,7 @@ define([
     "Lib/Vendor/Stats"
 ],
 
-function (Box2D, Parent, PhysicsEngine, ViewController, PlayerController, NotificationCenter, requestAnimFrame, Settings, Stats) {
+function (Parent, Box2D, PhysicsEngine, ViewController, PlayerController, NotificationCenter, requestAnimFrame, Settings, Stats) {
 
     function GameController () {
         this.viewController = new ViewController();
diff --git a/app/Game/Client/Networker.js b/app/Game/Client/Networker.js
index bd12d2b..e13c05e 100755
--- a/app/Game/Client/Networker.js
+++ b/app/Game/Client/Networker.js
@@ -1,7 +1,7 @@
 define([
     "Game/Core/Protocol/Helper", 
     "Game/Client/GameController",
-    "Game/Core/User",
+    "Game/Client/User",
     "Game/Core/NotificationCenter"
 ], 
 
diff --git a/app/Game/Client/User.js b/app/Game/Client/User.js
new file mode 100644
index 0000000..b3e9e67
--- /dev/null
+++ b/app/Game/Client/User.js
@@ -0,0 +1,9 @@
+define([
+	"Game/Core/User"
+],
+ 
+function(Parent) {
+
+    return Parent;
+ 
+});
\ No newline at end of file
diff --git a/app/Game/Client/View/CameraController.js b/app/Game/Client/View/CameraController.js
index 5f7eae7..1cd88b3 100755
--- a/app/Game/Client/View/CameraController.js
+++ b/app/Game/Client/View/CameraController.js
@@ -1,4 +1,9 @@
-define(['Lib/Vendor/Three', 'Game/Config/Settings'], function (Three, Settings) {
+define([
+    'Lib/Vendor/Three', 
+    'Game/Config/Settings'
+], 
+
+function (Three, Settings) {
 
     function CameraController () {
         this.zoom = 1;
diff --git a/app/Game/Client/View/DomController.js b/app/Game/Client/View/DomController.js
index b874b0e..23cf65c 100755
--- a/app/Game/Client/View/DomController.js
+++ b/app/Game/Client/View/DomController.js
@@ -1,4 +1,8 @@
-define(['Game/Config/Settings'], function (Settings) {
+define([
+    'Game/Config/Settings'
+], 
+
+function (Settings) {
 
     var DomController = {
         canvas: null,
diff --git a/app/Game/Core/Collision/Detector.js b/app/Game/Core/Collision/Detector.js
index e9c22e9..d867da4 100755
--- a/app/Game/Core/Collision/Detector.js
+++ b/app/Game/Core/Collision/Detector.js
@@ -1,9 +1,8 @@
 define([
-    "Lib/Vendor/Box2D", 
-    "Game/Core/Collision/Detector"
+    "Lib/Vendor/Box2D"
 ],
 
-function (Box2D, Parent) {
+function (Box2D) {
 
     function Detector () { // FIXME evtl.bind(this) ?
         this.listener = new Box2D.Dynamics.b2ContactListener();