From 5a778589eaa2c5d79ae3d92e80968a5b131f2ea5 Mon Sep 17 00:00:00 2001
From: Jeremiah Billmann <jcbillmann@yahoo.com>
Date: Sun, 14 Jul 2013 12:02:24 -0400
Subject: [PATCH] Removed set player state from client - should set from server

---
 client/garageserver.io.js                  |  7 +------
 example/public/javascripts/game.js         |  1 -
 example/shared/core.js                     |  2 +-
 lib/server/controllers/entitycontroller.js |  8 --------
 lib/server/controllers/playercontroller.js | 10 ----------
 lib/server/garageserver.io.js              | 17 +----------------
 lib/server/garageservergame.js             |  4 ----
 7 files changed, 3 insertions(+), 46 deletions(-)

diff --git a/client/garageserver.io.js b/client/garageserver.io.js
index 51abeba..db80fae 100644
--- a/client/garageserver.io.js
+++ b/client/garageserver.io.js
@@ -233,10 +233,6 @@ var GarageServerIO = (function (socketio) {
             return _stateController.id;
         },
 
-        setState = function (state) {
-            _socket.emit('playerState', state);
-        },
-
         addInput = function (clientInput) {
             _playerController.entities.some(function (player) {
                 if (player.id === _stateController.id) {
@@ -341,8 +337,7 @@ var GarageServerIO = (function (socketio) {
         initializeGarageServer: initializeGarageServer,
         addInput: addInput,
         getStates: getStates,
-        getId: getId,
-        setState: setState
+        getId: getId
     };
 
 }) (io);
\ No newline at end of file
diff --git a/example/public/javascripts/game.js b/example/public/javascripts/game.js
index a2be212..4ce1287 100644
--- a/example/public/javascripts/game.js
+++ b/example/public/javascripts/game.js
@@ -13,7 +13,6 @@ $(function () {
             document.getElementById('gameCanvas').style.height = state.height + 'px';
         }
     });
-    GarageServerIO.setState({ x: 0, y: 0 });
 
     GameLoop.start(
         //Render Loop
diff --git a/example/shared/core.js b/example/shared/core.js
index 20a00cb..3cb5cfe 100644
--- a/example/shared/core.js
+++ b/example/shared/core.js
@@ -18,7 +18,7 @@
                 state.y -= (50 * deltaTime);
             } else if (inputs[i].input === 'space') {
                 if (garageServer) {
-                    //garageServer.addEntity(new guid());
+                    garageServer.addEntity(new guid(), { x: state.x, y: state.y, direction: '' });
                 }
             }
         }
diff --git a/lib/server/controllers/entitycontroller.js b/lib/server/controllers/entitycontroller.js
index 511261e..c6a14dd 100644
--- a/lib/server/controllers/entitycontroller.js
+++ b/lib/server/controllers/entitycontroller.js
@@ -31,13 +31,5 @@ EntityController.prototype = {
                 return;
             }
         }
-    },
-    setState: function (id, state) {
-        this.entities.some(function (entity) {
-            if (entity.client.id === id) {
-                entity.state = state;
-                return true;
-            }
-        });
     }
 };
\ No newline at end of file
diff --git a/lib/server/controllers/playercontroller.js b/lib/server/controllers/playercontroller.js
index a0a9ca3..64b3803 100644
--- a/lib/server/controllers/playercontroller.js
+++ b/lib/server/controllers/playercontroller.js
@@ -34,14 +34,4 @@ PlayerController.prototype.addInput = function (id, input, sequence, time) {
             return true;
         }
     });
-};
-
-PlayerController.prototype.setState = function (id, state) {
-    this.entities.some(function (player) {
-        if (player.client.id === id) {
-            player.state = state;
-            player.inputs = [];
-            return true;
-        }
-    });
 };
\ No newline at end of file
diff --git a/lib/server/garageserver.io.js b/lib/server/garageserver.io.js
index 487bd74..f06446d 100644
--- a/lib/server/garageserver.io.js
+++ b/lib/server/garageserver.io.js
@@ -13,8 +13,7 @@ options = {
     onPlayerConnect: function (socket),
     onPlayerInput: function (socket, input),
     onPlayerDisconnect: function (socket),
-    onPing: function (socket, data),
-    onPlayerState: function (socket, data),
+    onPing: function (socket, data)
 }
 */
 
@@ -62,13 +61,6 @@ GarageServer.prototype.registerSocketEvents = function (options) {
             }
             self.onPing(socket, data, options);
         });
-        
-        socket.on('playerState', function (data) {
-            if (options.logging) {
-                console.log('garageserver.io:: socket playerState ' + data);
-            }
-            self.onPlayerState(socket, data, options);
-        });
     });
 };
 
@@ -101,13 +93,6 @@ GarageServer.prototype.onPing = function (socket, data, options) {
     }
 };
 
-GarageServer.prototype.onPlayerState = function (socket, data, options) {
-    this.game.setPlayerState(socket.id, data);
-    if (options.onPlayerState) {
-        options.onPlayerState(socket, data);
-    }
-};
-
 GarageServer.prototype.start = function () {
     this.game.start();
 };
diff --git a/lib/server/garageservergame.js b/lib/server/garageservergame.js
index 4365cb2..17f9925 100644
--- a/lib/server/garageservergame.js
+++ b/lib/server/garageservergame.js
@@ -100,10 +100,6 @@ GarageServerGame.prototype.removeEntity = function (id) {
     this.entityController.remove(id);
 };
 
-GarageServerGame.prototype.setPlayerState = function (id, state) {
-    this.playerController.setState(id, state);
-};
-
 GarageServerGame.prototype.addPlayerInput = function (id, input, sequence, time) {
     this.playerController.addInput(id, input, sequence, time);
 };
\ No newline at end of file