[adonthell-wastesedge-commits] Release_0-3-1 e22605d 178/237: Added various stuff on the map

[Kai Sterker]

tag: Release_0-3-1
commit e22605dc4aa48bdedbb5e4e859d050fd88b4b3b2
Author: adondev <adondev>
Commit: adondev <adondev>

    Added various stuff on the map
---
 gfx/mapcharacters/Makefile.am                  |    2 +-
 gfx/mapcharacters/bjarn_crying.mchar           |  Bin 0 -> 2477 bytes
 gfx/mapobjects/exteriors/Makefile.am           |    3 ++-
 gfx/mapobjects/exteriors/hay-cart.mobj         |  Bin 0 -> 2176 bytes
 gfx/mapobjects/exteriors/low-bushes-left.mobj  |  Bin 0 -> 178 bytes
 gfx/mapobjects/exteriors/low-bushes-mid.mobj   |  Bin 0 -> 1019 bytes
 gfx/mapobjects/exteriors/low-bushes-right.mobj |  Bin 0 -> 531 bytes
 gfx/mapobjects/walls/Makefile.am               |    2 +-
 gfx/mapobjects/walls/barn_loft_main_front.mobj |  Bin 0 -> 4875 bytes
 maps/test.map                                  |  Bin 3048 -> 3057 bytes
 10 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/gfx/mapcharacters/Makefile.am b/gfx/mapcharacters/Makefile.am
index 8b52068..1119e5e 100755
--- a/gfx/mapcharacters/Makefile.am
+++ b/gfx/mapcharacters/Makefile.am
@@ -2,6 +2,6 @@ pkgdatadir = $(gamedatadir)/gfx/mapcharacters
 
 pkgdata_DATA = frostbloom.mchar player.mchar servant1.mchar silverhair.mchar 
orloth.mchar \
        bjarn.mchar oliver.mchar lucia.mchar servant2.mchar talan.mchar \
-       erek.mchar fellnir.mchar jelom.mchar alek.mchar illig.mchar
+       erek.mchar fellnir.mchar jelom.mchar alek.mchar illig.mchar 
bjarn_crying.mchar
 
 EXTRA_DIST = $(pkgdata_DATA)
diff --git a/gfx/mapcharacters/bjarn_crying.mchar 
b/gfx/mapcharacters/bjarn_crying.mchar
new file mode 100644
index 0000000..493721f
Binary files /dev/null and b/gfx/mapcharacters/bjarn_crying.mchar differ
diff --git a/gfx/mapobjects/exteriors/Makefile.am 
b/gfx/mapobjects/exteriors/Makefile.am
index 6231549..7d89887 100755
--- a/gfx/mapobjects/exteriors/Makefile.am
+++ b/gfx/mapobjects/exteriors/Makefile.am
@@ -1,5 +1,6 @@
 pkgdatadir = $(gamedatadir)/gfx/mapobjects/exteriors
 
-pkgdata_DATA = treeleaves.mobj tree.mobj vine.mobj gate-fore.mobj 
gate-back.mobj
+pkgdata_DATA = treeleaves.mobj tree.mobj vine.mobj gate-fore.mobj 
gate-back.mobj \
+       hay-cart.mobj low-bushes-left.mobj low-bushes-mid.mobj 
low-bushes-right.mobj
 
 EXTRA_DIST = $(pkgdata_DATA)
diff --git a/gfx/mapobjects/exteriors/hay-cart.mobj 
b/gfx/mapobjects/exteriors/hay-cart.mobj
new file mode 100755
index 0000000..c6ec564
Binary files /dev/null and b/gfx/mapobjects/exteriors/hay-cart.mobj differ
diff --git a/gfx/mapobjects/exteriors/low-bushes-left.mobj 
b/gfx/mapobjects/exteriors/low-bushes-left.mobj
new file mode 100755
index 0000000..b833eca
Binary files /dev/null and b/gfx/mapobjects/exteriors/low-bushes-left.mobj 
differ
diff --git a/gfx/mapobjects/exteriors/low-bushes-mid.mobj 
b/gfx/mapobjects/exteriors/low-bushes-mid.mobj
new file mode 100755
index 0000000..2876b7b
Binary files /dev/null and b/gfx/mapobjects/exteriors/low-bushes-mid.mobj differ
diff --git a/gfx/mapobjects/exteriors/low-bushes-right.mobj 
b/gfx/mapobjects/exteriors/low-bushes-right.mobj
new file mode 100755
index 0000000..6fbc958
Binary files /dev/null and b/gfx/mapobjects/exteriors/low-bushes-right.mobj 
differ
diff --git a/gfx/mapobjects/walls/Makefile.am b/gfx/mapobjects/walls/Makefile.am
index 4abd6a4..0c296c7 100755
--- a/gfx/mapobjects/walls/Makefile.am
+++ b/gfx/mapobjects/walls/Makefile.am
@@ -5,7 +5,7 @@ pkgdatadir = $(gamedatadir)/gfx/mapobjects/walls
 pkgdata_DATA = painting1.mobj painting2.mobj painting3.mobj \
        window_right.mobj window_left.mobj window_front.mobj \
        window_round_front.mobj window_back.mobj barn_back.mobj \
-       barn_loft_main.mobj barn_loft_main_top.mobj \
+       barn_loft_main.mobj barn_loft_main_top.mobj barn_loft_main_front.mobj \
        barn_ground_back_top.mobj gate_back_wall.mobj
 
 EXTRA_DIST = $(pkgdata_DATA)
diff --git a/gfx/mapobjects/walls/barn_loft_main_front.mobj 
b/gfx/mapobjects/walls/barn_loft_main_front.mobj
new file mode 100644
index 0000000..8fc9e9a
Binary files /dev/null and b/gfx/mapobjects/walls/barn_loft_main_front.mobj 
differ
diff --git a/maps/test.map b/maps/test.map
index e354366..f914cce 100755
Binary files a/maps/test.map and b/maps/test.map differ