6 files changed, 34 insertions, 35 deletions
diff --git a/maps/000-0.tmx b/maps/000-0.tmx
index 808fdf6a..9d4dd07a 100644
--- a/maps/000-0.tmx
+++ b/maps/000-0.tmx
@@ -16,22 +16,22 @@
   <property name="overlay1scrollY" value="0.35"/>
  </properties>
  <tileset firstgid="1" source="../graphics/tilesets/water-raging.tsx"/>
- <tileset firstgid="241" name="Ship Base" tilewidth="32" tileheight="32" tilecount="220">
+ <tileset firstgid="241" name="Ship Base" tilewidth="32" tileheight="32" tilecount="220" columns="22">
   <image source="../graphics/tilesets/ship-base.png" width="704" height="320"/>
  </tileset>
- <tileset firstgid="461" name="Ship Mast" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="461" name="Ship Mast" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ship-mast.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="717" name="Collision" tilewidth="32" tileheight="32" tilecount="6">
+ <tileset firstgid="717" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
- <tileset firstgid="723" name="Ground" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="723" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="979" name="Box" tilewidth="32" tileheight="32" tilecount="36">
+ <tileset firstgid="979" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
  </tileset>
- <tileset firstgid="1015" name="Box x1x2" tilewidth="32" tileheight="64" tilecount="8">
+ <tileset firstgid="1015" name="Box x1x2" tilewidth="32" tileheight="64" tilecount="8" columns="4">
   <image source="../graphics/tilesets/box-x1x2.png" width="128" height="128"/>
  </tileset>
  <layer name="Ground" width="47" height="47">
diff --git a/maps/000-2-1.tmx b/maps/000-2-1.tmx
index a3febe57..7d8fd788 100644
--- a/maps/000-2-1.tmx
+++ b/maps/000-2-1.tmx
@@ -8,26 +8,26 @@
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value="La Johanne, Second Deck"/>
  </properties>
- <tileset firstgid="1" name="Ship Indoor" tilewidth="32" tileheight="32" tilecount="128">
+ <tileset firstgid="1" name="Ship Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8">
   <image source="../graphics/tilesets/ship-indoor.png" width="256" height="512"/>
  </tileset>
- <tileset firstgid="129" name="Ship Fringe" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="129" name="Ship Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ship-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="385" source="../graphics/tilesets/candle.tsx"/>
- <tileset firstgid="397" name="Box" tilewidth="32" tileheight="32" tilecount="36">
+ <tileset firstgid="397" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
  </tileset>
- <tileset firstgid="433" name="Collision" tilewidth="32" tileheight="32" tilecount="6">
+ <tileset firstgid="433" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
- <tileset firstgid="439" name="Ship Indoor x2x4" tilewidth="64" tileheight="128" tilecount="1">
+ <tileset firstgid="439" name="Ship Indoor x2x4" tilewidth="64" tileheight="128" tilecount="1" columns="1">
   <image source="../graphics/tilesets/ship-indoor-x2x4.png" width="64" height="128"/>
  </tileset>
- <tileset firstgid="440" name="Box x1x2" tilewidth="32" tileheight="64" tilecount="8">
+ <tileset firstgid="440" name="Box x1x2" tilewidth="32" tileheight="64" tilecount="8" columns="4">
   <image source="../graphics/tilesets/box-x1x2.png" width="128" height="128"/>
  </tileset>
- <tileset firstgid="448" name="Sunlight x1x5" tilewidth="32" tileheight="160" tilecount="4">
+ <tileset firstgid="448" name="Sunlight x1x5" tilewidth="32" tileheight="160" tilecount="4" columns="4">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
  <layer name="Ground" width="93" height="59" opacity="0.99">
diff --git a/maps/000-2-2.tmx b/maps/000-2-2.tmx
index 7eca307a..12aac188 100644
--- a/maps/000-2-2.tmx
+++ b/maps/000-2-2.tmx
@@ -8,29 +8,29 @@
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value="La Johanne, Hold"/>
  </properties>
- <tileset firstgid="1" name="Ship Indoor" tilewidth="32" tileheight="32" tilecount="128">
+ <tileset firstgid="1" name="Ship Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8">
   <image source="../graphics/tilesets/ship-indoor.png" width="256" height="512"/>
  </tileset>
- <tileset firstgid="129" name="Ship Fringe" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="129" name="Ship Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ship-indoor-fringe.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="385" name="Box" tilewidth="32" tileheight="32" tilecount="36">
+ <tileset firstgid="385" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
  </tileset>
  <tileset firstgid="421" source="../graphics/tilesets/candle.tsx"/>
- <tileset firstgid="433" name="Shadow" tilewidth="32" tileheight="32" tilecount="64">
+ <tileset firstgid="433" name="Shadow" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="497" name="Collision" tilewidth="32" tileheight="32" tilecount="6">
+ <tileset firstgid="497" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
- <tileset firstgid="503" name="Ship Indoor x2x4" tilewidth="64" tileheight="128" tilecount="1">
+ <tileset firstgid="503" name="Ship Indoor x2x4" tilewidth="64" tileheight="128" tilecount="1" columns="1">
   <image source="../graphics/tilesets/ship-indoor-x2x4.png" width="64" height="128"/>
  </tileset>
- <tileset firstgid="504" name="Box x1x2" tilewidth="32" tileheight="64" tilecount="8">
+ <tileset firstgid="504" name="Box x1x2" tilewidth="32" tileheight="64" tilecount="8" columns="4">
   <image source="../graphics/tilesets/box-x1x2.png" width="128" height="128"/>
  </tileset>
- <tileset firstgid="512" name="Sunlight x1x5" tilewidth="32" tileheight="160" tilecount="4">
+ <tileset firstgid="512" name="Sunlight x1x5" tilewidth="32" tileheight="160" tilecount="4" columns="4">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
  <layer name="Ground" width="70" height="62">
diff --git a/maps/000-2-3.tmx b/maps/000-2-3.tmx
index 48f28b2d..0fda61d3 100644
--- a/maps/000-2-3.tmx
+++ b/maps/000-2-3.tmx
@@ -7,28 +7,28 @@
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value="La Johanne, Nard's Room"/>
  </properties>
- <tileset firstgid="1" name="Ship Indoor" tilewidth="32" tileheight="32" tilecount="128">
+ <tileset firstgid="1" name="Ship Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8">
   <image source="../graphics/tilesets/ship-indoor.png" width="256" height="512"/>
  </tileset>
- <tileset firstgid="129" name="Ship Fringe" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="129" name="Ship Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ship-indoor-fringe.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="385" name="Box" tilewidth="32" tileheight="32" tilecount="36">
+ <tileset firstgid="385" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
  </tileset>
- <tileset firstgid="421" name="Carpet" tilewidth="32" tileheight="32" tilecount="9">
+ <tileset firstgid="421" name="Carpet" tilewidth="32" tileheight="32" tilecount="9" columns="3">
   <image source="../graphics/tilesets/carpet.png" width="96" height="96"/>
  </tileset>
- <tileset firstgid="430" name="Collision" tilewidth="32" tileheight="32" tilecount="6">
+ <tileset firstgid="430" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
- <tileset firstgid="436" name="Box x1x2" tilewidth="32" tileheight="64" tilecount="8">
+ <tileset firstgid="436" name="Box x1x2" tilewidth="32" tileheight="64" tilecount="8" columns="4">
   <image source="../graphics/tilesets/box-x1x2.png" width="128" height="128"/>
  </tileset>
- <tileset firstgid="444" name="Shadow" tilewidth="32" tileheight="32" tilecount="64">
+ <tileset firstgid="444" name="Shadow" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
- <tileset firstgid="508" name="Sunlight x1x5" tilewidth="32" tileheight="160" tilecount="4">
+ <tileset firstgid="508" name="Sunlight x1x5" tilewidth="32" tileheight="160" tilecount="4" columns="4">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
  <layer name="Ground" width="52" height="53">
diff --git a/maps/test.tmx b/maps/test.tmx
index 4b4e3052..7eda403f 100644
--- a/maps/test.tmx
+++ b/maps/test.tmx
@@ -8,16 +8,16 @@
   <property name="overlay0scrollX" value="0.3"/>
   <property name="overlay0scrollY" value="0.2"/>
  </properties>
- <tileset firstgid="1" name="artis-indoor" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="1" name="artis-indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Ground" tilewidth="32" tileheight="32" tilecount="256">
+ <tileset firstgid="257" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="513" name="level-number" tilewidth="32" tileheight="32" tilecount="16">
+ <tileset firstgid="513" name="level-number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
   <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
  </tileset>
- <tileset firstgid="529" name="Collision" tilewidth="32" tileheight="32" tilecount="6">
+ <tileset firstgid="529" name="Collision" tilewidth="32" tileheight="32" tilecount="6" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="64"/>
  </tileset>
  <layer name="Grass" width="100" height="100" visible="0">
diff --git a/maps/testbg.tmx b/maps/testbg.tmx
index 0d906ce0..6947676d 100644
--- a/maps/testbg.tmx
+++ b/maps/testbg.tmx
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" renderorder="right-down" width="30" height="30" tilewidth="32" tileheight="32" nextobjectid="1">
- <tileset firstgid="1" name="artis-indoor" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="artis-indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
  </tileset>
  <layer name="Ground" width="30" height="30">