Commit various mantis tasks, and other changes

1 files changed, 7 insertions, 6 deletions

diff --git a/maps/new_22-1.tmx b/maps/new_22-1.tmx
index e013bb9e..5fe0e635 100644
--- a/maps/new_22-1.tmx
+++ b/maps/new_22-1.tmx
@@ -1,9 +1,10 @@
-<?xml version="1.0"?>
-<map version="0.99b" orientation="orthogonal" width="120" height="116" tilewidth="32" tileheight="32">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
+<map version="1.0" orientation="orthogonal" width="120" height="116" tilewidth="32" tileheight="32">
  <properties>
-  <property name="overlay0image" value="graphics/images/ambient/spotlight.png"/>
   <property name="minimap" value="graphics/images/minimap_new_22-1.png"/>
   <property name="music" value="finalman_and_yakslem-cavesong.ogg"/>
+  <property name="overlay0image" value="graphics/images/ambient/spotlight.png"/>
  </properties>
  <tileset name="cave" firstgid="1" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/cave.png"/>
@@ -30,17 +31,17 @@
  </layer>
  <layer name="Fringe" width="120" height="116">
   <data encoding="base64" compression="gzip">
-   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
+   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
   </data>
  </layer>
  <layer name="Over" width="120" height="116">
   <data encoding="base64" compression="gzip">
-   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
+   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
   </data>
  </layer>
  <layer name="Collision" width="120" height="116">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAAO2TQW7DMAwE0//f8uKeCgSBLS1XlCmpQ2AuDsXQO/L75/V6AwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAswGf1+pQ5yv+pM+EZv72eyB1pVXUWp/D9DUX8fvc5jvA7x6n7/UTK3aU6n91wy5mRtVN1ZjswWq1Z379l7FSd105k1N28GXtV57UTMytzt+qcdiTiJMutU9U57chIjq4T3Nb5veuJOlb6q9/9dBQvqn/8rkfPi/ptRpzht86v4r93D0b94v0Ztz2/n2ci36N6n6rz2Zne96i4VWZE/LrzIO7XrYw7os6GWr8zqjq3HXC9KN5G/Ub2AM2tkmvGnKvnIzvjW8sqq2eWX8Vzda6roOTi9DzhF8fxXJQ+d+YMv60dqjPe0a8zF7/n+FU94rfGb6tac9ScI88dR/id43fEY28v/M53q/oY9es6ds6ciluu37vnkR2d96nOeUW/rR5lTuQeKXu671Kd8Yp+e33KrIjfDA/41TJx+0b9jrrAba7fiONIZb5Pdb6ruY36VRw7hd95jqN+v89E/KkznfepznYFoq56z6N3welX36k62xVYwW/vDH7X8atUZBf8nu836gq/ul/Fmds7yzF+25mOZJ7px53h/u+pKHmM+h3dKTILv3En0Z6n9ppxt05EyaXVM9MBfp/x28qwd9Y9d3Uev/McO56ciu529/vVrP+Km/OsytqtOteVcDOcVRG/V7tW57kiGdkr5zLuTnVWOxLNNdsFnvfym7lH6zm0s4z4VeuJu4bjvAwrssbvuW6VXaszXBU1r2qvvV2qc1wVN6vqbKvv2C7sns2uewMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/PELh/cBu4DZAAA=
+   H4sIAAAAAAAAAO2TQW7DMAwE0/+fmhf30gKBYUu7FGVK7hCYi0Mx9I78/nq93gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC/BZvT5ljvJ/6ky4x2+vx7kjrarO4ikcvyHH77HPcfT9C37nOI1+P05F/VbnsxvRiszI2qk6sx0Yrdas428ZO1XntRMZdTVvxl7Vee3EzMrcrTqnHXGcZLmNVHVOOzKSY9QJbuv8XvW4jpX+6nd/OooX1T9+16PnRf02HWf4rfOr+O/dg1G/eL/Hbc/v5xnne1TvU3U+O9P7HhW3ygzHb3Qe+H6jlXFH1NlQ63dGVee2A1EvirdRv84eoLlVcs2Yc/Z8ZGd8a1ll9czyq3iuznUVlFwiPXf4xbGfi9IXnTnDb2uH6ox39BuZi9/n+FU94rfGb6tac9ScnecRR/id43fEY28v/M53q/oY9Rt1HDnzVKIV9Xv13Nkx8j7VOa/ot9WjzHHukbJn9F2qM17Rb69PmeX4zfCAXy2TaN+o31EXuM316zh2KvN9qvNdza3rV3EcKfzOc+z6PZ5x/KkzI+9Tne0KuK56z927EOlX36k62xVYwW/vDH7X8auUswt+n+/XdYVf3a/iLNo7yzF+25mOZJ7pJzoj+r9PRclj1O/oTs4s/PpO3J679ppxt56IkkurZ6YD/N7jt5Vh72z03Nl5/M5zHPEUKXe3q9/PZv1XojnPqqzdqnNdiWiGs8rxe7ZrdZ4rkpG9ci7j7lRntSNurtku8LyX38w9Ws+hnaXjV6077hqO8zKsyBq/z3Wr7Fqd4aqoeVV77e1SneOqRLOqzrb6ju3C7tnsujcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwB8/un740IDZAAA=
   </data>
  </layer>
 </map>