Mercurial > hg > batmud > gmap2

changeset 50:71e517b5dc92 gmap2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Adjustments.
author Matti Hamalainen <ccr@tnsp.org>
date Sat, 08 Jan 2011 22:05:12 +0200
parents 7fbf21283e2b
children b2caa543eec4
files markers.js tools/makegmaps.php
diffstat 2 files changed, 13 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/markers.js	Sat Jan 08 21:56:23 2011 +0200
+++ b/markers.js	Sat Jan 08 22:05:12 2011 +0200
@@ -45,20 +45,21 @@
     var type = markers[j].getAttribute("type");
     if (type == "") type = "default";
     if (name.indexOf('FERRY') == 0) type = "ferry";
-    var continent=markers[j].getAttribute("continent");
+    var continent = markers[j].getAttribute("continent");
     var p = proj.fromPixelToLatLng(new GPoint(x*2+1,y*2+1),7);
     var marker = createMarker(p, name, html, icons[type], type, continent, "builtin");
     if (areas[type] == undefined) areas[type] = [];
     areas[type].push(marker);    
   }
 
-  mgr.addMarkers(areas["default"],7,11);
-  mgr.addMarkers(areas["pcity"],7,11);
-  mgr.addMarkers(areas["guild"],6,11);
-  mgr.addMarkers(areas["shrine"],7,11);
-  mgr.addMarkers(areas["ferry"],4,11);
-  mgr.addMarkers(areas["city"],4,11);
-  mgr.addMarkers(areas["fort"],4,11);
+  mgr.addMarkers(areas["default"], 7, 11);
+  mgr.addMarkers(areas["guild"],   6, 11);
+  mgr.addMarkers(areas["shrine"],  7, 11);
+  mgr.addMarkers(areas["ferry"],   4, 11);
+  mgr.addMarkers(areas["city"],    4, 11);
+
+  mgr.addMarkers(areas["pcity"],   8, 11);
+  mgr.addMarkers(areas["fort"],    8, 11);
   mgr.refresh();
 
   document.getElementById("sidecontent").innerHTML = side_builtin_html;
--- a/tools/makegmaps.php	Sat Jan 08 21:56:23 2011 +0200
+++ b/tools/makegmaps.php	Sat Jan 08 22:05:12 2011 +0200
@@ -319,12 +319,12 @@
         $ty=0;
       }
 
-      if ($dx>$cw*$scale-$tx) {
-        $dx=$cw*$scale-$tx;
+      if ($dx > $cw*$scale-$tx) {
+        $dx = $cw*$scale-$tx;
       }
 
-      if ($dy>$ch*$scale-$ty) {
-        $dy=$ch*$scale-$ty;
+      if ($dy > $ch*$scale-$ty) {
+        $dy = $ch*$scale-$ty;
       }
 
       imagecopy($im, $mapData[$continent]["map"], $xx, $yy, $tx, $ty, $dx, $dy);