[adonthell-wastesedge-commits] Release_0-3-1 7a8047a 075/237: Moved transition files to their real place.

[Kai Sterker]

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

    Moved transition files to their real place.
---
 gfx/mapobjects/floorings/Makefile.am                                |    3 ++-
 gfx/mapobjects/{furnitures => floorings}/terracotta-trans.mobj      |  Bin 
1686 -> 1686 bytes
 .../{furnitures => floorings}/woodenplanks_2_trans_1.mobj           |  Bin 
1888 -> 1888 bytes
 .../{furnitures => floorings}/woodenplanks_2_trans_2.mobj           |  Bin 
1893 -> 1893 bytes
 gfx/mapobjects/{furnitures => floorings}/woodenplanks_trans.mobj    |  Bin 
1789 -> 1789 bytes
 gfx/mapobjects/furnitures/Makefile.am                               |    3 +--
 maps/test.map                                                       |  Bin 
2432 -> 2466 bytes
 7 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gfx/mapobjects/floorings/Makefile.am 
b/gfx/mapobjects/floorings/Makefile.am
index e323c6e..2364a7d 100755
--- a/gfx/mapobjects/floorings/Makefile.am
+++ b/gfx/mapobjects/floorings/Makefile.am
@@ -3,6 +3,7 @@ pkgdatadir = $(gamedatadir)/gfx/mapobjects/floorings
 pkgdata_DATA = woodenplanks.mobj bath-floor2b.mobj bath-floor2a.mobj \
        bath-floor1b.mobj bath-floor1a.mobj terracotta-tiles-1.mobj \
        terracotta-tiles-3.mobj terracotta-tiles-3.mobj woodenplanks_2_1.mobj \
-       woodenplanks_2_2.mobj
+       woodenplanks_2_2.mobj terracotta-trans.mobj \
+       woodenplanks_2_trans_1.mobj woodenplanks_2_trans_2.mobj 
woodenplanks_trans.mobj
 
 EXTRA_DIST = $(pkgdata_DATA)
diff --git a/gfx/mapobjects/furnitures/terracotta-trans.mobj 
b/gfx/mapobjects/floorings/terracotta-trans.mobj
similarity index 100%
rename from gfx/mapobjects/furnitures/terracotta-trans.mobj
rename to gfx/mapobjects/floorings/terracotta-trans.mobj
diff --git a/gfx/mapobjects/furnitures/woodenplanks_2_trans_1.mobj 
b/gfx/mapobjects/floorings/woodenplanks_2_trans_1.mobj
similarity index 100%
rename from gfx/mapobjects/furnitures/woodenplanks_2_trans_1.mobj
rename to gfx/mapobjects/floorings/woodenplanks_2_trans_1.mobj
diff --git a/gfx/mapobjects/furnitures/woodenplanks_2_trans_2.mobj 
b/gfx/mapobjects/floorings/woodenplanks_2_trans_2.mobj
similarity index 100%
rename from gfx/mapobjects/furnitures/woodenplanks_2_trans_2.mobj
rename to gfx/mapobjects/floorings/woodenplanks_2_trans_2.mobj
diff --git a/gfx/mapobjects/furnitures/woodenplanks_trans.mobj 
b/gfx/mapobjects/floorings/woodenplanks_trans.mobj
similarity index 100%
rename from gfx/mapobjects/furnitures/woodenplanks_trans.mobj
rename to gfx/mapobjects/floorings/woodenplanks_trans.mobj
diff --git a/gfx/mapobjects/furnitures/Makefile.am 
b/gfx/mapobjects/furnitures/Makefile.am
index e84ed7e..12e716d 100755
--- a/gfx/mapobjects/furnitures/Makefile.am
+++ b/gfx/mapobjects/furnitures/Makefile.am
@@ -10,7 +10,6 @@ pkgdata_DATA = bar.mobj barrel_wooden_with-tap.mobj 
clock.mobj cupboard.mobj ove
        silverhair_basin.mobj silverhair_chest.mobj stone_bed.mobj stone_v.mobj 
\
        crate.mobj barrel_wooden.mobj crate2.mobj barrel_wooden2.mobj 
dwarf_chest.mobj \
        normal-cupboard.mobj chest-wooden.mobj silverhair_rug-1.mobj 
silverhair_rug-2.mobj \
-       silverhair_rug-3.mobj silverhair_rug-4.mobj terracotta-trans.mobj \
-       woodenplanks_2_trans_1.mobj woodenplanks_2_trans_2.mobj 
woodenplanks_trans.mobj
+       silverhair_rug-3.mobj silverhair_rug-4.mobj
 
 EXTRA_DIST = $(pkgdata_DATA)
diff --git a/maps/test.map b/maps/test.map
index cc9eb03..f731905 100755
Binary files a/maps/test.map and b/maps/test.map differ