summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorP. J. McDermott <pjm@nac.net>2013-02-20 08:04:59 (EST)
committer P. J. McDermott <pjm@nac.net>2013-02-20 08:04:59 (EST)
commitb87ba33f92354fca6d9cbb8ad76f62bc01233787 (patch)
tree864496109eab2516f8b03c33cd9289ddf21d24d2
parent46a5952de18f4585dac2a2b0962c269344c62be4 (diff)
downloadoverworld-rpg-b87ba33f92354fca6d9cbb8ad76f62bc01233787.zip
overworld-rpg-b87ba33f92354fca6d9cbb8ad76f62bc01233787.tar.gz
overworld-rpg-b87ba33f92354fca6d9cbb8ad76f62bc01233787.tar.bz2
Organize maps in their own directory.
-rw-r--r--data/Makefile.am6
-rw-r--r--data/maps/Makefile.am6
-rw-r--r--data/maps/forest1-8bit.tmx (renamed from data/forest1-8bit.tmx)4
-rw-r--r--data/maps/town1.tmx9
-rw-r--r--data/maps/town2.tmx9
-rw-r--r--data/tilesets/Makefile.am2
-rw-r--r--src/main.c2
7 files changed, 29 insertions, 9 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index dae37c2..d95a62c 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,8 +1,4 @@
+include $(top_srcdir)/data/maps/Makefile.am
include $(top_srcdir)/data/tilesets/Makefile.am
-dist_data_DATA = \
- data/forest1-8bit.tmx \
- data/town1.tmx \
- data/town2.tmx
-
clean-local-data: clean-local-data-tilesets
diff --git a/data/maps/Makefile.am b/data/maps/Makefile.am
new file mode 100644
index 0000000..fd7038c
--- /dev/null
+++ b/data/maps/Makefile.am
@@ -0,0 +1,6 @@
+mapsdir = $(pkgdatadir)/maps
+
+dist_maps_DATA = \
+ data/maps/forest1-8bit.tmx \
+ data/maps/town1.tmx \
+ data/maps/town2.tmx
diff --git a/data/forest1-8bit.tmx b/data/maps/forest1-8bit.tmx
index ec16a33..81ecfad 100644
--- a/data/forest1-8bit.tmx
+++ b/data/maps/forest1-8bit.tmx
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.0" orientation="orthogonal" width="30" height="40" tilewidth="16" tileheight="16">
<tileset firstgid="1" name="mountain_landscape_19-16" tilewidth="16" tileheight="16">
- <image source="tilesets/mountain_landscape_19-16-8bit.png" trans="fc00ff" width="256" height="256"/>
+ <image source="../tilesets/mountain_landscape_19-16-8bit.png" trans="fc00ff" width="256" height="256"/>
</tileset>
- <tileset firstgid="257" source="tilesets/collision.tsx"/>
+ <tileset firstgid="257" source="../tilesets/collision.tsx"/>
<layer name="ground" width="30" height="40">
<data encoding="base64" compression="zlib">
eJztlsERAjEIRSlArUCtwLWVtQPtQDtwS18OHpwdIvwv7EFz+MMhkyEvgR9GEbmoRjDuVYeXjsT+q+pGxGVedD96zl/n3ai2hu7FvO9cLVXwRvNW8k6qwdC5mJfhyuBl3rHzdl6Et+VjlnaJvBE/+XRPrA+jeVu8qA97PvYM8qI+7NW5t876sFfn3jrbpxW8kT7tvN/zPsT3IG++YnhRZfEyeVnek9g9G5E1X0V5s2OUNzt23hre5f/t9XcFHzJvZL4nMm9k8k7i9/da9bsGb+Q/+zfeGUt8RgE=
diff --git a/data/maps/town1.tmx b/data/maps/town1.tmx
new file mode 100644
index 0000000..32d828c
--- /dev/null
+++ b/data/maps/town1.tmx
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" orientation="orthogonal" width="1" height="1" tilewidth="16" tileheight="16">
+ <tileset firstgid="257" source="../tilesets/collision.tsx"/>
+ <layer name="ground" width="30" height="40">
+ <data encoding="base64" compression="zlib">
+ eJztlsERAjEIRSlArUCtwLWVtQPtQDtwS18OHpwdIvwv7EFz+MMhkyEvgR9GEbmoRjDuVYeXjsT+q+pGxGVedD96zl/n3ai2hu7FvO9cLVXwRvNW8k6qwdC5mJfhyuBl3rHzdl6Et+VjlnaJvBE/+XRPrA+jeVu8qA97PvYM8qI+7NW5t876sFfn3jrbpxW8kT7tvN/zPsT3IG++YnhRZfEyeVnek9g9G5E1X0V5s2OUNzt23hre5f/t9XcFHzJvZL4nMm9k8k7i9/da9bsGb+Q/+zfeGUt8RgE=
+ </data>
+ </layer>
+</map>
diff --git a/data/maps/town2.tmx b/data/maps/town2.tmx
new file mode 100644
index 0000000..31eb0c4
--- /dev/null
+++ b/data/maps/town2.tmx
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" orientation="orthogonal" width="2" height="2" tilewidth="16" tileheight="16">
+ <tileset firstgid="257" source="../tilesets/collision.tsx"/>
+ <layer name="ground" width="30" height="40">
+ <data encoding="base64" compression="zlib">
+ eJztlsERAjEIRSlArUCtwLWVtQPtQDtwS18OHpwdIvwv7EFz+MMhkyEvgR9GEbmoRjDuVYeXjsT+q+pGxGVedD96zl/n3ai2hu7FvO9cLVXwRvNW8k6qwdC5mJfhyuBl3rHzdl6Et+VjlnaJvBE/+XRPrA+jeVu8qA97PvYM8qI+7NW5t876sFfn3jrbpxW8kT7tvN/zPsT3IG++YnhRZfEyeVnek9g9G5E1X0V5s2OUNzt23hre5f/t9XcFHzJvZL4nMm9k8k7i9/da9bsGb+Q/+zfeGUt8RgE=
+ </data>
+ </layer>
+</map>
diff --git a/data/tilesets/Makefile.am b/data/tilesets/Makefile.am
index 3c2782d..146aad6 100644
--- a/data/tilesets/Makefile.am
+++ b/data/tilesets/Makefile.am
@@ -2,7 +2,7 @@ tilesets_sources = \
data/tilesets/collision.xcf \
data/tilesets/mountain_landscape_19-16-8bit.xcf
-tilesetsdir = $(datadir)/tilesets
+tilesetsdir = $(pkgdatadir)/tilesets
tilesets_DATA = \
data/tilesets/collision.png \
diff --git a/src/main.c b/src/main.c
index c36a35c..8c5463e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -31,7 +31,7 @@ main(void)
init();
vp = init_viewport(240, 160, 8);
- map = map_get("data/forest1-8bit.tmx");
+ map = map_get("data/maps/forest1-8bit.tmx");
a = area_new(map);
for (i = 0; i < 256; ++i) {