aboutsummaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorSamu Laaksonen <laaksonen.sj@gmail.com>2012-09-29 17:02:52 +0300
committerSamu Laaksonen <laaksonen.sj@gmail.com>2012-09-29 17:02:52 +0300
commit87618947d1de7cdd1ff9a8047acec3279ef253b4 (patch)
tree986b1c867878c373aa3c94a67ccfeedec9333576 /data
parent1cf5a427a829b22abea7027b18a130a01da3ed6a (diff)
downloadprism-87618947d1de7cdd1ff9a8047acec3279ef253b4.tar.gz
prism-87618947d1de7cdd1ff9a8047acec3279ef253b4.zip
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
Diffstat (limited to 'data')
-rw-r--r--data/levels/level_1.tmx19
-rw-r--r--data/levels/tileset/tileset.pngbin695 -> 0 bytes
-rw-r--r--data/levels/tileset/tileset2.pngbin0 -> 2815 bytes
3 files changed, 15 insertions, 4 deletions
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
--- a/data/levels/tileset/tileset.png
+++ /dev/null
Binary files differ
diff --git a/data/levels/tileset/tileset2.png b/data/levels/tileset/tileset2.png
new file mode 100644
index 0000000..a840ea9
--- /dev/null
+++ b/data/levels/tileset/tileset2.png
Binary files differ