summaryrefslogtreecommitdiff
path: root/maps/000-2-0.tmx
diff options
context:
space:
mode:
authorReid <reidyaro@gmail.com>2012-05-23 23:14:58 +0200
committerReid <reidyaro@gmail.com>2012-05-23 23:14:58 +0200
commit1f984976298155aa60169e04d30dba4eb09f73b1 (patch)
tree996dfe3b45977f3aad501affa945c45a697d7c99 /maps/000-2-0.tmx
parentfff9c1f556e21115d07a7ecb2faa6c117e2adc4f (diff)
downloadclientdata-1f984976298155aa60169e04d30dba4eb09f73b1.tar.gz
clientdata-1f984976298155aa60169e04d30dba4eb09f73b1.tar.bz2
clientdata-1f984976298155aa60169e04d30dba4eb09f73b1.tar.xz
clientdata-1f984976298155aa60169e04d30dba4eb09f73b1.zip
Correct some problem caused by the merge.
Diffstat (limited to 'maps/000-2-0.tmx')
-rw-r--r--maps/000-2-0.tmx10
1 files changed, 5 insertions, 5 deletions
diff --git a/maps/000-2-0.tmx b/maps/000-2-0.tmx
index bfbc57fb..3d5f957d 100644
--- a/maps/000-2-0.tmx
+++ b/maps/000-2-0.tmx
@@ -6,13 +6,13 @@
<property name="music" value="bartk-indoor-artis.ogg"/>
</properties>
<tileset firstgid="1" name="Ship-indoor" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/Indoor/Ship-indoor.png" width="256" height="512"/>
+ <image source="../graphics/tilesets/Indoor/Ship-indoor.png" width="256" height="512"/>
</tileset>
<tileset firstgid="129" name="Village-indoor2" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/Indoor/Village-indoor2.png" width="512" height="512"/>
+ <image source="../graphics/tilesets/Indoor/Village-indoor2.png" width="512" height="512"/>
</tileset>
<tileset firstgid="385" name="Candle" tilewidth="32" tileheight="64">
- <image source="../graphics/tiles/Indoor/Candle.png" width="96" height="128"/>
+ <image source="../graphics/tilesets/Indoor/Candle.png" width="96" height="128"/>
<tile id="0">
<properties>
<property name="animation-delay0" value="13"/>
@@ -43,10 +43,10 @@
</tile>
</tileset>
<tileset firstgid="391" name="Box" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/Indoor/Box.png" width="128" height="160"/>
+ <image source="../graphics/tilesets/Indoor/Box.png" width="128" height="160"/>
</tileset>
<tileset firstgid="411" 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>
<layer name="Ground" width="52" height="53">
<data encoding="base64" compression="gzip">