From f75ad02b94e2bf8510882abc7ba55241a42279f3 Mon Sep 17 00:00:00 2001 From: akirschbaum Date: Mon, 28 Nov 2005 21:17:19 +0000 Subject: [PATCH] Make pushable objects work again. This patch fixes a problem introduced by a recent server change; it does not change map behavior. git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@4061 282e977c-c81d-0410-88c4-b93c2d0d6712 --- pup_land/nurnberg/reception/electricity3 | 1 + pup_land/rainbow/w-tower | 2 ++ pup_land/s_f/Kira | 1 + pup_land/s_f/st7 | 2 ++ pup_land/world | 1 + quests/mak/MainFloor | 1 + scorn/temples/gorokh | 1 + sisters/necro_hole1 | 1 + sisters/necro_ruin1 | 1 + sisters/shrine1 | 4 ++++ unlinked/academy.crap/MainFloor | 1 + 11 files changed, 16 insertions(+) diff --git a/pup_land/nurnberg/reception/electricity3 b/pup_land/nurnberg/reception/electricity3 index 54dbf3f28..c920ce724 100644 --- a/pup_land/nurnberg/reception/electricity3 +++ b/pup_land/nurnberg/reception/electricity3 @@ -257,6 +257,7 @@ y 3 material 64 weight 3000000 can_roll 1 +move_type 1 end arch marble x 2 diff --git a/pup_land/rainbow/w-tower b/pup_land/rainbow/w-tower index 552859cfd..8fc9a55ca 100644 --- a/pup_land/rainbow/w-tower +++ b/pup_land/rainbow/w-tower @@ -1238,6 +1238,7 @@ arch statue x 9 y 15 can_roll 1 +move_type 1 end arch woodfloor x 9 @@ -1928,6 +1929,7 @@ arch statue x 15 y 9 can_roll 1 +move_type 1 end arch woodfloor x 15 diff --git a/pup_land/s_f/Kira b/pup_land/s_f/Kira index 3bff12c22..0abbdd60a 100644 --- a/pup_land/s_f/Kira +++ b/pup_land/s_f/Kira @@ -697,6 +697,7 @@ face viking.151 x 8 y 5 can_roll 1 +move_type 1 end arch woodfloor x 8 diff --git a/pup_land/s_f/st7 b/pup_land/s_f/st7 index 65404e34e..ac3d7b988 100644 --- a/pup_land/s_f/st7 +++ b/pup_land/s_f/st7 @@ -443,6 +443,7 @@ x 5 y 5 weight 1000000 can_roll 1 +move_type 1 end arch button_plate x 5 @@ -706,6 +707,7 @@ y 7 weight 2000000 no_pass 1 can_roll 1 +move_type 1 end arch flagstone x 7 diff --git a/pup_land/world b/pup_land/world index 50930f441..570d620b4 100644 --- a/pup_land/world +++ b/pup_land/world @@ -5249,6 +5249,7 @@ arch statue material 64 weight 4000000 can_roll 1 +move_type 1 x 27 y 32 end diff --git a/quests/mak/MainFloor b/quests/mak/MainFloor index b5a1de9d6..348f18ff2 100644 --- a/quests/mak/MainFloor +++ b/quests/mak/MainFloor @@ -12196,6 +12196,7 @@ name really big statue material 64 weight 10000000 can_roll 1 +move_type 1 x 25 y 34 end diff --git a/scorn/temples/gorokh b/scorn/temples/gorokh index f22c527e4..002ef5129 100644 --- a/scorn/temples/gorokh +++ b/scorn/temples/gorokh @@ -983,6 +983,7 @@ end arch fireplace weight 1000000 can_roll 1 +move_type 1 x 11 y 3 end diff --git a/sisters/necro_hole1 b/sisters/necro_hole1 index bd1b64b0f..3da1c0fc1 100644 --- a/sisters/necro_hole1 +++ b/sisters/necro_hole1 @@ -4846,6 +4846,7 @@ arch cwall_0 x 21 y 28 can_roll 1 +move_type 1 end arch dungeon_floor x 21 diff --git a/sisters/necro_ruin1 b/sisters/necro_ruin1 index d50f94460..d098d838d 100644 --- a/sisters/necro_ruin1 +++ b/sisters/necro_ruin1 @@ -1360,6 +1360,7 @@ name statue of regal man x 9 y 9 can_roll 1 +move_type 1 end arch cobblestones2 x 9 diff --git a/sisters/shrine1 b/sisters/shrine1 index 15f13ea4c..b38bec298 100644 --- a/sisters/shrine1 +++ b/sisters/shrine1 @@ -2758,6 +2758,7 @@ y 27 end arch statue can_roll 1 +move_type 1 x 14 y 27 end @@ -2775,6 +2776,7 @@ y 30 end arch statue can_roll 1 +move_type 1 x 14 y 30 end @@ -3338,6 +3340,7 @@ y 27 end arch statue can_roll 1 +move_type 1 x 17 y 27 end @@ -3355,6 +3358,7 @@ y 30 end arch statue can_roll 1 +move_type 1 x 17 y 30 end diff --git a/unlinked/academy.crap/MainFloor b/unlinked/academy.crap/MainFloor index 8abe394d2..c98d6cdaa 100644 --- a/unlinked/academy.crap/MainFloor +++ b/unlinked/academy.crap/MainFloor @@ -3871,6 +3871,7 @@ y 6 material 64 weight 1500000 can_roll 1 +move_type 1 end arch dungeon_magic x 22