multi/index.js

@@ -165,18 +165,9 @@ class MultiGame {
     }
 
     _endRound(room, round) {
-        var allResults = this._collectResultsInRound(room, round);
+        var data = { position: round.place.position, allResults: this._collectResultsInRound(room, round) };
         var self = this;
-        room.members.forEach(function (member, token) {
+        room.members.forEach(function (member) {
-            var result = { guessPosition: null, distance: null, score: 0 };
-
-            if (round.results.has(token)) {
-                result = round.results.get(token);
-            } else {
-                round.results.set(token, result);
-            }
-
-            var data = { position: round.place.position, result: result, allResults: allResults };
             self._sendToMember(member, 'end_round', data);
         });
     }
@@ -192,13 +183,9 @@ class MultiGame {
         }
 
         data.history = [];
-        for (var i = 0; i <= room.currentRound; ++i) {
+        for (var i = 0; i < room.currentRound; ++i) {
             var round = room.rounds[i];
 
-            if (i === room.currentRound && !round.results.has(token)) {
-                continue;
-            }
-
             var result = { guessPosition: null, distance: null, score: 0 };
             var allResults = [];
 
@@ -223,8 +210,6 @@ class MultiGame {
             data.members.push({ userName: currentMember.userName, me: member === currentMember });
         });
 
-        data.readyToContinue = room.currentRound >= 0 && room.members.size === room.rounds[room.currentRound].results.size
-
         this._sendToMember(member, 'initialize', data);
     }
 

public/static/js/game.js

@@ -132,19 +132,14 @@
                 }
 
                 if (data.place) {
-                    Game.readyToContinue = data.readyToContinue;
+                    Game.readyToContinue = false;
                     Game.panoId = data.place.panoId;
                     Game.pov = data.place.pov;
 
                     document.getElementById('multi').style.visibility = 'hidden';
+                    document.getElementById('panoCover').style.visibility = 'hidden';
 
-                    if (Game.rounds.length === 0 || !Game.rounds[Game.rounds.length - 1].position) {
+                    Game.startNewRound();
-                        document.getElementById('panoCover').style.visibility = 'hidden';
-                        Game.startNewRound();
-                    } else {
-                        Game.loadPano(Game.panoId, Game.pov);
-                        Game.showResultFromHistory(data.history[data.history.length - 1].result);
-                    }
                 }
 
                 document.getElementById('loading').style.visibility = 'hidden';
@@ -208,7 +203,7 @@
                 document.getElementById('guessButton').disabled = true;
                 document.getElementById('panoCover').style.visibility = 'visible';
 
-                Game.receiveResult(data.position, data.result.guessPosition, { distance: data.result.distance, score: data.result.score }, data.allResults);
+                Game.showResults(data.position, null, { distance: NaN, score: 0 }, data.allResults);
             }
         },
 
@@ -416,7 +411,18 @@
             Game.panorama.setPano(panoId);
         },
 
-        receiveResult: function (position, guessPosition, result, allResults) {
+        showResults: function (position, guessPosition, result, allResults) {
+            if (Game.adaptGuess) {
+                document.getElementById('guess').classList.remove('adapt');
+            }
+
+            if (Game.guessMarker) {
+                Game.guessMarker.setMap(null);
+                Game.guessMarker = null;
+            }
+
+            document.getElementById('guess').classList.add('result');
+
             Game.scoreSum += result.score;
             document.getElementById('currentScoreSum').innerHTML = String(Game.scoreSum) + '/' + String(Game.rounds.length * Game.MAX_SCORE);
 
@@ -439,46 +445,13 @@
                 }
             }
 
-            Game.showResultMap(result, resultBounds);
-        },
-
-        showResultFromHistory: function (result) {
-            var round = Game.rounds[Game.rounds.length - 1];
-            var resultBounds = new google.maps.LatLngBounds();
-
-            round.realMarker.setVisible(true);
-            resultBounds.extend(round.position);
-
-            for (var j = 0; j < round.guessMarkers.length; ++j) {
-                var guessMarker = round.guessMarkers[j];
-                guessMarker.marker.setVisible(true);
-                guessMarker.line.setVisible(true);
-
-                resultBounds.extend(guessMarker.marker.getPosition());
-            }
-
-            Game.showResultMap(result, resultBounds);
-        },
-
-        showResultMap: function (result, resultBounds) {
-            if (Game.adaptGuess) {
-                document.getElementById('guess').classList.remove('adapt');
-            }
-
-            if (Game.guessMarker) {
-                Game.guessMarker.setMap(null);
-                Game.guessMarker = null;
-            }
-
-            document.getElementById('guess').classList.add('result');
-
             Game.map.setOptions({
                 draggableCursor: 'grab'
             });
             Game.map.fitBounds(resultBounds);
 
             var distanceInfo = document.getElementById('distanceInfo');
-            if (result.distance === null) {
+            if (Number.isNaN(result.distance)) {
                 distanceInfo.children[0].style.display = 'none';
                 distanceInfo.children[1].style.display = 'block';
             } else {
@@ -533,7 +506,7 @@
                     return;
                 }
 
-                Game.receiveResult(this.response.position, guessPosition, this.response.result, this.response.allResults);
+                Game.showResults(this.response.position, guessPosition, this.response.result, this.response.allResults);
 
                 if (this.response.place) {
                     Game.panoId = this.response.place.panoId;