From 87618947d1de7cdd1ff9a8047acec3279ef253b4 Mon Sep 17 00:00:00 2001
From: Samu Laaksonen <laaksonen.sj@gmail.com>
Date: Sat, 29 Sep 2012 17:02:52 +0300
Subject: Level loading update

Improved level loading
- added better first test level
- mapLoader now loads all data layers from level files
- TODO: further improve loader so it can read layer depths too
- added unloadMap() to release resources used by levels
---
 data/levels/level_1.tmx          |  19 +++++++++++++++----
 data/levels/tileset/tileset.png  | Bin 695 -> 0 bytes
 data/levels/tileset/tileset2.png | Bin 0 -> 2815 bytes
 3 files changed, 15 insertions(+), 4 deletions(-)
 delete mode 100644 data/levels/tileset/tileset.png
 create mode 100644 data/levels/tileset/tileset2.png

(limited to 'data/levels')

diff --git a/data/levels/level_1.tmx b/data/levels/level_1.tmx
index 6d374fc..6c77c45 100644
--- a/data/levels/level_1.tmx
+++ b/data/levels/level_1.tmx
@@ -1,11 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map version="1.0" orientation="orthogonal" width="25" height="15" tilewidth="32" tileheight="32">
- <tileset firstgid="1" name="base" tilewidth="32" tileheight="32">
-  <image source="tileset/tileset.png" width="32" height="32"/>
+ <tileset firstgid="1" name="tileset2" tilewidth="32" tileheight="32">
+  <image source="tileset/tileset2.png" width="96" height="96"/>
  </tileset>
- <layer name="solidground" width="25" height="15">
+ <layer name="solid" width="25" height="15">
+  <properties>
+   <property name="type" value="solid"/>
+  </properties>
   <data encoding="base64" compression="zlib">
-   eJxjYBgFwxUwomFS1ROjZ6iDweTfoRD+2NxIT3fisn8UY2IAdcAAZA==
+   eJxjYBgFo2BwARYgZgViNjT2SAKjYTBwAFfYU5PNDsQcQMxJQzYAG8cBgA==
+  </data>
+ </layer>
+ <layer name="plants" width="25" height="15">
+  <properties>
+   <property name="type" value="covering"/>
+  </properties>
+  <data encoding="base64" compression="zlib">
+   eJxjYBgFo4B4wAjETEDMjMYeSWA0DAYO4Ap7arKHCwAAgOgASg==
   </data>
  </layer>
 </map>
diff --git a/data/levels/tileset/tileset.png b/data/levels/tileset/tileset.png
deleted file mode 100644
index 017027b..0000000
Binary files a/data/levels/tileset/tileset.png and /dev/null differ
diff --git a/data/levels/tileset/tileset2.png b/data/levels/tileset/tileset2.png
new file mode 100644
index 0000000..a840ea9
Binary files /dev/null and b/data/levels/tileset/tileset2.png differ
-- 
cgit v1.2.3