From 35fb4a442e9be579e03fccc20160eacb2d19056e Mon Sep 17 00:00:00 2001
From: ryo_saeba <ryo_saeba@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Sat, 7 Aug 2010 14:02:51 +0000
Subject: [PATCH] Explicitely fix 'move_block all' to 'move_block swim'. This
 is to remove a hack in server that prevent sitems from merging.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@13562 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 styles/decorstyles/creepy              | 3 +++
 styles/decorstyles/goblinjunk          | 2 ++
 styles/decorstyles/monuments           | 2 ++
 styles/decorstyles/religious_devourers | 5 +++++
 styles/decorstyles/religious_gaea      | 5 +++++
 styles/decorstyles/religious_generic   | 5 +++++
 styles/decorstyles/religious_gnarg     | 5 +++++
 styles/decorstyles/religious_gorokh    | 8 ++++++++
 styles/decorstyles/religious_lythander | 5 +++++
 styles/decorstyles/religious_mostrai   | 5 +++++
 styles/decorstyles/religious_ruggilli  | 9 +++++++++
 styles/decorstyles/religious_sorig     | 5 +++++
 styles/decorstyles/religious_valriel   | 5 +++++
 13 files changed, 64 insertions(+)

diff --git a/styles/decorstyles/creepy b/styles/decorstyles/creepy
index 38bac2afe..172793bba 100644
--- a/styles/decorstyles/creepy
+++ b/styles/decorstyles/creepy
@@ -4,6 +4,7 @@ width 6
 height 6
 msg
 Created:  1998-02-26
+Modified: 2010-08-07 Nicolas Weeger
 endmsg
 end
 arch gravestone
@@ -49,10 +50,12 @@ y 2
 end
 arch statue
 x 4
+move_block swim
 end
 arch statue
 x 4
 y 1
+move_block swim
 end
 arch bones5
 x 4
diff --git a/styles/decorstyles/goblinjunk b/styles/decorstyles/goblinjunk
index 7d75b96c0..4e2fcda12 100644
--- a/styles/decorstyles/goblinjunk
+++ b/styles/decorstyles/goblinjunk
@@ -4,9 +4,11 @@ width 6
 height 6
 msg
 Created:  1998-02-26
+Modified: 2010-08-07 Nicolas Weeger
 endmsg
 end
 arch barrel
+move_block swim
 end
 arch booze
 y 1
diff --git a/styles/decorstyles/monuments b/styles/decorstyles/monuments
index aa89a1d29..07b2d0085 100644
--- a/styles/decorstyles/monuments
+++ b/styles/decorstyles/monuments
@@ -4,9 +4,11 @@ width 6
 height 6
 msg
 Created:  1998-02-26
+Modified: 2010-08-07 Nicolas Weeger
 endmsg
 end
 arch statue
+move_block swim
 end
 arch fountain
 x 1
diff --git a/styles/decorstyles/religious_devourers b/styles/decorstyles/religious_devourers
index 771f02d52..331cc0599 100644
--- a/styles/decorstyles/religious_devourers
+++ b/styles/decorstyles/religious_devourers
@@ -4,6 +4,7 @@ width 6
 height 6
 msg
 Created:  1998-02-26
+Modified: 2010-08-07 Nicolas Weeger
 endmsg
 end
 arch altar_devourers
@@ -25,18 +26,22 @@ y 3
 end
 arch statue
 x 2
+move_block swim
 end
 arch statue
 x 2
 y 1
+move_block swim
 end
 arch statue
 x 2
 y 2
+move_block swim
 end
 arch statue
 x 2
 y 3
+move_block swim
 end
 arch gravestone
 x 3
diff --git a/styles/decorstyles/religious_gaea b/styles/decorstyles/religious_gaea
index 4ba99749d..6137ecc39 100644
--- a/styles/decorstyles/religious_gaea
+++ b/styles/decorstyles/religious_gaea
@@ -4,6 +4,7 @@ width 6
 height 6
 msg
 Created:  1998-02-26
+Modified: 2010-08-07 Nicolas Weeger
 endmsg
 end
 arch altar_gaea
@@ -70,16 +71,20 @@ y 3
 end
 arch statue
 x 5
+move_block swim
 end
 arch statue
 x 5
 y 1
+move_block swim
 end
 arch statue
 x 5
 y 2
+move_block swim
 end
 arch statue
 x 5
 y 3
+move_block swim
 end
diff --git a/styles/decorstyles/religious_generic b/styles/decorstyles/religious_generic
index c29bae33b..9bd07ee5b 100644
--- a/styles/decorstyles/religious_generic
+++ b/styles/decorstyles/religious_generic
@@ -4,6 +4,7 @@ width 6
 height 6
 msg
 Created:  1998-02-26
+Modified: 2010-08-07 Nicolas Weeger
 endmsg
 end
 arch altar_none
@@ -25,16 +26,20 @@ y 3
 end
 arch statue
 x 2
+move_block swim
 end
 arch statue
 x 2
 y 1
+move_block swim
 end
 arch statue
 x 2
 y 2
+move_block swim
 end
 arch statue
 x 2
 y 3
+move_block swim
 end
diff --git a/styles/decorstyles/religious_gnarg b/styles/decorstyles/religious_gnarg
index fc2306a12..10181c432 100644
--- a/styles/decorstyles/religious_gnarg
+++ b/styles/decorstyles/religious_gnarg
@@ -4,6 +4,7 @@ width 6
 height 6
 msg
 Created:  1998-02-26
+Modified: 2010-08-07 Nicolas Weeger
 endmsg
 end
 arch altar_gnarg
@@ -25,18 +26,22 @@ y 3
 end
 arch statue
 x 2
+move_block swim
 end
 arch statue
 x 2
 y 1
+move_block swim
 end
 arch statue
 x 2
 y 2
+move_block swim
 end
 arch statue
 x 2
 y 3
+move_block swim
 end
 arch poison
 x 3
diff --git a/styles/decorstyles/religious_gorokh b/styles/decorstyles/religious_gorokh
index ee71b4ede..a890d0874 100644
--- a/styles/decorstyles/religious_gorokh
+++ b/styles/decorstyles/religious_gorokh
@@ -8,6 +8,7 @@ enter_x 1
 enter_y 1
 msg
 Created:  1999-01-25 Raphaël Quinet (raphael@gimp.org)
+Modified: 2010-08-07 Nicolas Weeger
 endmsg
 end
 arch altar_gorokh
@@ -30,31 +31,38 @@ end
 arch statue
 face statue_gargoyle.111
 x 2
+move_block swim
 end
 arch statue
 face statue_gargoyle.111
 x 2
 y 1
+move_block swim
 end
 arch statue
 face statue_gargoyle.111
 x 2
 y 2
+move_block swim
 end
 arch brazier
 x 3
+move_block swim
 end
 arch brazier
 x 3
 y 1
+move_block swim
 end
 arch brazier
 x 3
 y 2
+move_block swim
 end
 arch brazier
 x 3
 y 3
+move_block swim
 end
 arch pentagram
 x 4
diff --git a/styles/decorstyles/religious_lythander b/styles/decorstyles/religious_lythander
index 68ef81473..c20f16dfd 100644
--- a/styles/decorstyles/religious_lythander
+++ b/styles/decorstyles/religious_lythander
@@ -4,6 +4,7 @@ width 6
 height 6
 msg
 Created:  1998-02-26
+Modified: 2010-08-07 Nicolas Weeger
 endmsg
 end
 arch altar_lythander
@@ -25,16 +26,20 @@ y 3
 end
 arch statue
 x 2
+move_block swim
 end
 arch statue
 x 2
 y 1
+move_block swim
 end
 arch statue
 x 2
 y 2
+move_block swim
 end
 arch statue
 x 2
 y 3
+move_block swim
 end
diff --git a/styles/decorstyles/religious_mostrai b/styles/decorstyles/religious_mostrai
index a1a6a609a..dad2e94b1 100644
--- a/styles/decorstyles/religious_mostrai
+++ b/styles/decorstyles/religious_mostrai
@@ -4,6 +4,7 @@ width 6
 height 6
 msg
 Created:  1998-02-26
+Modified: 2010-08-07 Nicolas Weeger
 endmsg
 end
 arch altar_mostrai
@@ -25,18 +26,22 @@ y 3
 end
 arch statue
 x 2
+move_block swim
 end
 arch statue
 x 2
 y 1
+move_block swim
 end
 arch statue
 x 2
 y 2
+move_block swim
 end
 arch statue
 x 2
 y 3
+move_block swim
 end
 arch goblin_head
 x 3
diff --git a/styles/decorstyles/religious_ruggilli b/styles/decorstyles/religious_ruggilli
index e12e4461e..1593c4233 100644
--- a/styles/decorstyles/religious_ruggilli
+++ b/styles/decorstyles/religious_ruggilli
@@ -4,6 +4,7 @@ width 6
 height 6
 msg
 Created:  1998-02-26
+Modified: 2010-08-07 Nicolas Weeger
 endmsg
 end
 arch altar_ruggilli
@@ -25,31 +26,39 @@ y 3
 end
 arch statue
 x 2
+move_block swim
 end
 arch statue
 x 2
 y 1
+move_block swim
 end
 arch statue
 x 2
 y 2
+move_block swim
 end
 arch statue
 x 2
 y 3
+move_block swim
 end
 arch brazier
 x 3
+move_block swim
 end
 arch brazier
 x 3
 y 1
+move_block swim
 end
 arch brazier
 x 3
 y 2
+move_block swim
 end
 arch brazier
 x 3
 y 3
+move_block swim
 end
diff --git a/styles/decorstyles/religious_sorig b/styles/decorstyles/religious_sorig
index 99bc97b44..ef2bd9953 100644
--- a/styles/decorstyles/religious_sorig
+++ b/styles/decorstyles/religious_sorig
@@ -4,6 +4,7 @@ width 6
 height 6
 msg
 Created:  1999-01-25 Raphaël Quinet (raphael@gimp.org)
+Modified: 2010-08-07 Nicolas Weeger
 endmsg
 end
 arch altar_sorig
@@ -25,18 +26,22 @@ y 3
 end
 arch statue
 x 2
+move_block swim
 end
 arch statue
 x 2
 y 1
+move_block swim
 end
 arch statue
 x 2
 y 2
+move_block swim
 end
 arch statue
 x 2
 y 3
+move_block swim
 end
 arch fog
 x 3
diff --git a/styles/decorstyles/religious_valriel b/styles/decorstyles/religious_valriel
index a834a5b99..449b32fe4 100644
--- a/styles/decorstyles/religious_valriel
+++ b/styles/decorstyles/religious_valriel
@@ -4,6 +4,7 @@ width 6
 height 6
 msg
 Created:  1999-01-25 Raphaël Quinet (raphael@gimp.org)
+Modified: 2010-08-07 Nicolas Weeger
 endmsg
 end
 arch altar_valriel
@@ -25,18 +26,22 @@ y 3
 end
 arch statue
 x 2
+move_block swim
 end
 arch statue
 x 2
 y 1
+move_block swim
 end
 arch statue
 x 2
 y 2
+move_block swim
 end
 arch statue
 x 2
 y 3
+move_block swim
 end
 arch gravestone2
 x 3