refactor: remove player in localcache

Wasn't really using it anyways..

Author: TGRHavoc

js/map.min.js

@@ -257,13 +257,7 @@ function clearAllMarkers() {
     _MAP_markerStore.length = 0;
     // Re-do player markers
     for(var id in localCache){
-        var plr = localCache[id].player;
-        //console.log("redoing marker for ");
-        //console.log(plr);
-        var obj = new MarkerObject(plr.name, new Coordinates(plr.x, plr.y, plr.z), MarkerTypes.normal, "A player", "", "");
-        createMarker(false, false, obj, plr.name);
-
-        localCache[plr.id].marker = _MAP_markerStore.length - 1;
+        localCache[id].marker = null;
     }
 }
 

js/socket.min.js

@@ -149,6 +149,10 @@ function doPlayerUpdate(players){
         playerCount ++;
         if (plr == null) return;
 
+        if ( !(plr.id in localCache) ){
+            localCache[plr.id] = { marker: null };
+        }
+
         if ($("#playerSelect option[value='" + plr.id + "']").length <= 0){
             $("#playerSelect").append($("<option>", {
                 value: plr.id,
@@ -160,64 +164,41 @@ function doPlayerUpdate(players){
             map.panTo(convertToMapGMAP(plr.x, plr.y));
         }
 
-        if (plr.id in localCache){
-
-            //console.log(JSON.stringify(plr));
-            //console.log(JSON.stringify(localCache[plr.name]));
-
-            if (plr.x == localCache[plr.id].player.x
-                && plr.y == localCache[plr.id].player.y
-                && plr.z == localCache[plr.id].player.z){
-                    //Don't update position.. Player hasn't moved
-                    console.log("Player " + plr.name + " hasn't moved");
-            }else{
-                console.log("updated local cache for " + plr.name);
-                //console.log(JSON.stringify(plr));
-                if (localCache[plr.id].marker != null && plr.vehicle && plr.vehicle != localCache[plr.id].player.vehicle){
-                    // They've changed vehicle
-                    var t = MarkerTypes[plr.vehicle];
-                    _MAP_markerStore[localCache[plr.id].marker].setIcon({
-                        url: _MAP_iconURL + t.icon,
-                        size: t.size,
-                        origin: t.origin,
-                        anchor: t.anchor,
-                        scaledSize: t.scaledSize
-                    });
-                }
-
-                localCache[plr.id].player = plr;
-
-                if (localCache[plr.id].marker != null || localCache[plr.id].marker != undefined){
-                    //update postion
-                    _MAP_markerStore[localCache[plr.id].marker].setPosition( convertToMapGMAP(plr.x, plr.y) );
-
-                    //update popup
-                    var html = '<div class="row info-body-row"><strong>Position:</strong>&nbsp;X {' + plr.x.toFixed(4) + "} Y {" + plr.y.toFixed(4) + "} Z {" + plr.z.toFixed(4) + "}</div>"
-
-                    if (plr.vehicle && plr.vehicle != "normal")
-                        html += '<div class="row info-body-row"><strong>Vehicle:</strong>&nbsp;' + plr.vehicle_name + '</div>';
-
-                    var infoContent = '<div class="info-window"><div class="info-header-box"><div class="info-icon"></div><div class="info-header">' + plr.name + '</div></div><div class="clear"></div><div id=info-body>' + html + "</div></div>";
-                    var infoBox = new google.maps.InfoWindow({
-                        content: infoContent
-                    });
-                    _MAP_markerStore[localCache[plr.id].marker].popup.setContent(infoContent);
-                }else{
-                    var obj = new MarkerObject(plr.name, new Coordinates(plr.x, plr.y, plr.z), MarkerTypes.normal, "A player", "", "");
-                    createMarker(false, false, obj, plr.name);
-
-                    localCache[plr.id].marker = _MAP_markerStore.length - 1;
-                }
+        if (localCache[plr.id].marker != null || localCache[plr.id].marker != undefined){
+
+            if (plr.vehicle){
+                var t = MarkerTypes[plr.vehicle];
+                _MAP_markerStore[localCache[plr.id].marker].setIcon({
+                    url: _MAP_iconURL + t.icon,
+                    size: t.size,
+                    origin: t.origin,
+                    anchor: t.anchor,
+                    scaledSize: t.scaledSize
+                });
             }
 
+            _MAP_markerStore[localCache[plr.id].marker].setPosition( convertToMapGMAP(plr.x, plr.y) );
+
+            //update popup
+            var html = '<div class="row info-body-row"><strong>Position:</strong>&nbsp;X {' + plr.x.toFixed(4) + "} Y {" + plr.y.toFixed(4) + "} Z {" + plr.z.toFixed(4) + "}</div>"
+
+            if (plr.vehicle && plr.vehicle != "normal")
+                html += '<div class="row info-body-row"><strong>Vehicle:</strong>&nbsp;' + plr.vehicle_name + '</div>';
+
+            var infoContent = '<div class="info-window"><div class="info-header-box"><div class="info-icon"></div><div class="info-header">' + plr.name + '</div></div><div class="clear"></div><div id=info-body>' + html + "</div></div>";
+            var infoBox = new google.maps.InfoWindow({
+                content: infoContent
+            });
+            _MAP_markerStore[localCache[plr.id].marker].popup.setContent(infoContent);
+
+
         }else{
-            localCache[plr.id] = {};
-            localCache[plr.id].player = plr;
             var obj = new MarkerObject(plr.name, new Coordinates(plr.x, plr.y, plr.z), MarkerTypes.normal, "A player", "", "");
             createMarker(false, false, obj, plr.name);
 
             localCache[plr.id].marker = _MAP_markerStore.length - 1;
         }
+
     });
 
     console.log("Playercount: " + playerCount);