esoko/mapguesser
esoko/mapguesser
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 18 Wiki Activity

feature/MAPG-203-initial-multiplayer-implementation #5

Merged
bence merged 4 commits from feature/MAPG-203-initial-multiplayer-implementation into develop 2021-03-15 12:32:54 +01:00
Conversation 0 Commits 4 Files Changed 4 +10 -5
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c317a0abf4 - Show all commits

15
public/static/js/game.js
View File

@ -26,7 +26,7 @@
}); });
Game.map.fitBounds(mapBounds); Game.map.fitBounds(mapBounds);
MapGuesser.httpRequest('GET', '/game/' + mapId + '/newPlace.json', function () { MapGuesser.httpRequest('GET', '/game/' + mapId + '/initialData.json', function () {
document.getElementById('loading').style.visibility = 'hidden'; document.getElementById('loading').style.visibility = 'hidden';
document.getElementById('panoCover').style.visibility = 'hidden'; document.getElementById('panoCover').style.visibility = 'hidden';
@ -35,8 +35,8 @@
return; return;
} }
Game.panoId = this.response.panoId; Game.panoId = this.response.place.panoId;
Game.pov = this.response.pov; Game.pov = this.response.place.pov;
if (this.response.history) { if (this.response.history) {
for (var i = 0; i < this.response.history.length; ++i) { for (var i = 0; i < this.response.history.length; ++i) {
@ -200,8 +200,13 @@
document.getElementById('showSummaryButton').style.display = 'block'; document.getElementById('showSummaryButton').style.display = 'block';
} }
Game.panoId = this.response.panoId; if (this.response.newPlace) {
Game.pov = this.response.pov; Game.panoId = this.response.newPlace.panoId;
Game.pov = this.response.newPlace.pov;
} else {
Game.panoId = null;
Game.pov = null;
}
}, data); }, data);
}, },