From ed02a548785a05efa20c7cb760ee830929f3bbb9 Mon Sep 17 00:00:00 2001
From: Jeremiah Billmann <jcbillmann@yahoo.com>
Date: Thu, 27 Jun 2013 20:06:50 -0400
Subject: [PATCH] Code cleanup

---
 client/garageserver.io.js | 38 +++++++++++++++++++++++++-------------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/client/garageserver.io.js b/client/garageserver.io.js
index 113ca73..682b070 100644
--- a/client/garageserver.io.js
+++ b/client/garageserver.io.js
@@ -260,25 +260,37 @@ window.GarageServerIO = (function (window, socketio) {
         updateEntityState = function (data) {
             
         },
-
-        getPlayerStates = function (stateCallback) {
+        
+        getPlayerStatesCurrent = function (stateCallback) {
             _playerController.forEach(function (player) {
                 if (player.anyUpdates()) {
-                    var latestUpdate = player.getLatestUpdate();
-
-                    if (_options.interpolation && _options.onInterpolation) {
-                        var positions = player.getPositions(_stateController.time, _stateController.frameTime);
-                        if (positions.previousState && positions.targetState) {
-                            stateCallback(_options.onInterpolation(latestUpdate.state, positions.previousState, positions.targetState, positions.amount));
-                        }
-                        else {
-                            stateCallback(latestUpdate.state);
-                        }
-                    } else {
+                    stateCallback(player.getLatestUpdate());
+                }
+            });
+        },
+        
+        getPlayerStatesInterpolated = function (stateCallback) {
+            _playerController.forEach(function (player) {
+                if (player.anyUpdates()) {
+                    var latestUpdate = player.getLatestUpdate(),
+                        positions = player.getPositions(_stateController.time, _stateController.frameTime);
+                    if (positions.previousState && positions.targetState) {
+                        stateCallback(_options.onInterpolation(latestUpdate.state, positions.previousState, positions.targetState, positions.amount));
+                    }
+                    else {
                         stateCallback(latestUpdate.state);
                     }
                 }
             });
+        },
+
+        getPlayerStates = function (stateCallback) {
+            if(_options.interpolation && _options.onInterpolation) {
+                getPlayerStatesInterpolated(stateCallback);
+            }
+            else {
+                getPlayerStatesCurrent(stateCallback);
+            }
             stateCallback(_stateController.state);
         };