From 1f984976298155aa60169e04d30dba4eb09f73b1 Mon Sep 17 00:00:00 2001
From: Reid <reidyaro@gmail.com>
Date: Wed, 23 May 2012 23:14:58 +0200
Subject: Correct some problem caused by the merge.

---
 maps/000-1.tmx | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'maps/000-1.tmx')

diff --git a/maps/000-1.tmx b/maps/000-1.tmx
index 46bed959..c03b9525 100644
--- a/maps/000-1.tmx
+++ b/maps/000-1.tmx
@@ -10,19 +10,22 @@
   <property name="overlay0scrollY" value="0.1"/>
  </properties>
  <tileset firstgid="1" name="Water" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/Water.png" width="480" height="352"/>
+  <image source="../graphics/tilesets/Water.png" width="480" height="352"/>
  </tileset>
  <tileset firstgid="166" name="Ship_base" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/Ship_base.png" width="704" height="320"/>
+  <image source="../graphics/tilesets/Ship_base.png" width="704" height="320"/>
  </tileset>
  <tileset firstgid="386" name="Ship2" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/Ship2.png" width="512" height="512"/>
+  <image source="../graphics/tilesets/Ship2.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="642" name="Collision" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/Collision.png" width="64" height="64"/>
+  <image source="../graphics/tilesets/Collision.png" width="64" height="64"/>
  </tileset>
  <tileset firstgid="646" name="Ground" tilewidth="32" tileheight="32">
-  <image source="../graphics/tiles/Ground.png" width="512" height="512"/>
+  <image source="../graphics/tilesets/Ground.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="902" name="Tree_x4" tilewidth="96" tileheight="128">
+  <image source="../graphics/tilesets/Tree_x4.png" width="480" height="256"/>
  </tileset>
  <layer name="Ground" width="120" height="140">
   <data encoding="base64" compression="gzip">
@@ -41,7 +44,7 @@
  </layer>
  <layer name="Over" width="120" height="140">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3BMQEAAADCoPVPbQwfoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPgbKjKnngAYBAA==
+   H4sIAAAAAAAAA+3OQQ0AAAgEoNvMb2dbqA9IQAIAAAAAAAAAAAAAAAAAAAAAAAAA8EPX9QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANg2pJBGHIAGAQA=
   </data>
  </layer>
  <layer name="Collision" width="120" height="140">
-- 
cgit v1.2.3-60-g2f50