From 524af0cc10453c6427db6ed447a9efb51e740a25 Mon Sep 17 00:00:00 2001 From: Jeremiah Billmann Date: Thu, 27 Jun 2013 21:25:54 -0400 Subject: [PATCH] Comments cleanup & minor fix --- client/garageserver.io.js | 9 ++++++--- lib/server/garageserver.io.js | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/client/garageserver.io.js b/client/garageserver.io.js index 6796f3b..02b6428 100644 --- a/client/garageserver.io.js +++ b/client/garageserver.io.js @@ -3,9 +3,9 @@ options = { onPlayerConnect: function() onPlayerDisconnect: function (), onPlayerReconnect: function (), - onPlayerUpdate: function (data), + onPlayerUpdate: function (state), onPlayerRemove: function (id), - onPing: function (data), + onPing: function (pingDelay), onUpdatePlayerPhysics: function (state, inputs), onInterpolation: function(currentState, previousState, targetState, amount) logging: true, @@ -160,6 +160,9 @@ window.GarageServerIO = (function (window, socketio) { }); _socket.on('ping', function(data) { _pingDelay = new Date().getTime() - data; + if (_options.onPing) { + _options.onPing(_pingDelay); + } if (_options.logging) { console.log('garageserver.io:: socket ping delay ' + _pingDelay); } @@ -225,7 +228,7 @@ window.GarageServerIO = (function (window, socketio) { } if (_options.onPlayerUpdate) { - _options.onPlayerUpdate(playerState); + _options.onPlayerUpdate(playerState.state); } }); }, diff --git a/lib/server/garageserver.io.js b/lib/server/garageserver.io.js index 3b5c764..e83bf71 100644 --- a/lib/server/garageserver.io.js +++ b/lib/server/garageserver.io.js @@ -54,7 +54,7 @@ GarageServer.prototype.registerSocketEvents = function (options) { if (options.logging) { console.log('garageserver.io:: socket state ' + data); } - self.onPing(socket, data, options); + self.onState(socket, data, options); }); }); };