LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Merge pull request #669

Browse Source 
Merge branch 'player_marker' of https://github.com/JonnyJD/Minecraft-Overviewer into devel

Conflicts:
	genPOI.py
	overviewer_core/data/js_src/views.js
This commit is contained in:
Andrew Chin
2012-04-14 22:42:27 -04:00
parent 2a6769c5ac 122eaee37d
commit 5f1bf1851d
4 changed files with 45 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
overviewer_core/data/js_src/views.js
View File

@@ -437,6 +437,16 @@ overviewer.views.SignControlView = Backbone.View.extend({
if (!markersDB[groupName].created) {
for (j in markersDB[groupName].raw) {
var entity = markersDB[groupName].raw[j];
if (entity['id'] == 'Player') {
iconURL = "http://overviewer.org/avatar/"
+ entity['EntityId'];
} else if (entity['id'] == 'PlayerSpawn') {
iconURL = overviewerConfig.CONST.image.bedMarker;
} else if (entity['id'] == 'Sign') {
iconURL = overviewerConfig.CONST.image.signMarker;
} else {
iconURL = overviewerConfig.CONST.image.defaultMarker;
}
var marker = new google.maps.Marker({
'position': overviewer.util.fromWorldToLatLng(entity.x,
entity.y, entity.z, overviewer.mapView.options.currentTileSet),