From 23679a84e51313ae589daf54993d302fe436598a Mon Sep 17 00:00:00 2001
From: Jeremiah Billmann <jcbillmann@yahoo.com>
Date: Fri, 28 Jun 2013 09:13:17 -0400
Subject: [PATCH] Loop & short circuit fixes

---
 client/garageserver.io.js      | 26 ++++++++++++--------------
 lib/server/garageservergame.js | 12 ++++++------
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/client/garageserver.io.js b/client/garageserver.io.js
index 02b6428..1cf0a68 100644
--- a/client/garageserver.io.js
+++ b/client/garageserver.io.js
@@ -63,7 +63,7 @@ window.GarageServerIO = (function (window, socketio) {
         addUpate: function (state, seq, time) {
             this.updates.push({ state: state, seq: seq, time: time });
             if (this.updates.length > 60) {
-                this.updates.updates.splice(0, 1);
+                this.updates.splice(0, 1);
             }
         },
         getLatestUpdate: function () {
@@ -71,18 +71,15 @@ window.GarageServerIO = (function (window, socketio) {
         },
         processState: function (playerState, time) {
             var updateFound = false;
-            for (var i = 0; i < this.updates.length; i ++) {
-                if (this.updates[i].seq === playerState.seq) {
-                    this.updates[i].state = playerState.state;
-                    updateFound = true;
-                    break;
-                }
-            }
+            this.updates.some(function (update) {
+               if (update.seq === playerState.seq) {
+                   update.state = playerState.state;
+                   updateFound = true;
+                   return true;
+               } 
+            });
             if (!updateFound) {
-                this.updates.push({ state: playerState.state, seq: playerState.seq, time: time });
-                if (this.updates.length > 60) {
-                    this.updates.splice(0, 1);
-                }
+                this.addUpate(playerState.state, playerState.seq, time);
             }
         },
         getPositions: function (time, frameTime) {
@@ -243,13 +240,14 @@ window.GarageServerIO = (function (window, socketio) {
         },
         
         updateOtherPlayersState = function (playerState, time) {
+            // FIX:  Loops over every play for each state
             var playerFound = false;
-            _playerController.players.forEach(function (player) {
+            _playerController.players.some(function (player) {
                 if (player.id === playerState.id) {
                     playerFound = true;
                     player.processState(playerState, time);
+                    return true;
                 }
-                return;
             });
             if (!playerFound) {
                 var newPlayer = _playerController.addPlayer(playerState.id);
diff --git a/lib/server/garageservergame.js b/lib/server/garageservergame.js
index 62eeac3..67d157f 100644
--- a/lib/server/garageservergame.js
+++ b/lib/server/garageservergame.js
@@ -47,9 +47,9 @@ GarageServerGame.prototype.updatePhysics = function (options) {
 };
 
 GarageServerGame.prototype.addPlayer = function (client) {
-    this.players.forEach(function (player) {
+    this.players.some(function (player) {
         if (player.client.id === client.id) {
-            return;
+            return true;
         }
     });
 
@@ -74,21 +74,21 @@ GarageServerGame.prototype.removePlayer = function (client) {
 };
 
 GarageServerGame.prototype.setPlayerState = function (client, state) {
-    this.players.forEach(function (player) {
+    this.players.some(function (player) {
         if (player.client.id === client.id) {
             player.state = state;
             player.sequence += 1;
             player.inputs = [];
+            return true;
         }
-        return;
     });
 };
 
 GarageServerGame.prototype.addPlayerInput = function (client, input) {
-    this.players.forEach(function (player) {
+    this.players.some(function (player) {
         if (player.client.id === client.id) {
             player.inputs.push(input);
-            return;
+            return true;
         }
     });
 };