From: kuniuthefrogg <ekuniu@gmail.com>
Date: Thu, 16 May 2013 19:56:11 +0000 (+0200)
Subject: fix a barrel inside a teleporter
X-Git-Tag: xonotic-v0.7.0~23^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=22d4a7c2a57af955af5ae80f5b70bcfefdd4a016;p=xonotic%2Fxonotic-maps.pk3dir.git

fix a barrel inside a teleporter
---

diff --git a/maps/drain.map b/maps/drain.map
index 08f86e98..8de3b2ee 100644
--- a/maps/drain.map
+++ b/maps/drain.map
@@ -8787,14 +8787,14 @@ trak5x/base-pipe1d
 ( 64 -88 64 ) ( 64 -48 64 ) ( 64 -88 224 ) common/clip 0 0 0 0.25 0.25 0 0 0
 }
 {
-( 240 -52 60 ) ( 240 -76 60 ) ( 200 -52 60 ) common/weapclip 0 240 0 0.25 0.25 0 0 0
-( 240 -44 24 ) ( 200 -44 24 ) ( 240 -44 16 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
-( 236 -48 24 ) ( 236 -48 16 ) ( 236 -72 24 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
-( 200 -72 16 ) ( 240 -72 16 ) ( 200 -48 16 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
-( 200 -76 16 ) ( 200 -76 24 ) ( 240 -76 16 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
-( 204 -72 16 ) ( 204 -48 16 ) ( 204 -72 24 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
-( 204 -56 -64 ) ( 216 -44 -64 ) ( 204 -56 64 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
-( 224 -44 -64 ) ( 236 -56 -64 ) ( 224 -44 64 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( 240 -36 60 ) ( 240 -60 60 ) ( 200 -36 60 ) common/clip 0 48 0 0.25 0.25 0 0 0
+( 240 -28 24 ) ( 200 -28 24 ) ( 240 -28 16 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 236 -32 24 ) ( 236 -32 16 ) ( 236 -56 24 ) common/clip 192 0 0 0.25 0.25 0 0 0
+( 200 -56 16 ) ( 240 -56 16 ) ( 200 -32 16 ) common/clip 0 64 0 0.25 0.25 0 0 0
+( 200 -60 16 ) ( 200 -60 24 ) ( 240 -60 16 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 204 -56 16 ) ( 204 -32 16 ) ( 204 -56 24 ) common/clip 192 0 0 0.25 0.25 0 0 0
+( 204 -40 -64 ) ( 216 -28 -64 ) ( 204 -40 64 ) common/clip 192 0 0 0.25 0.25 0 0 0
+( 224 -28 -64 ) ( 236 -40 -64 ) ( 224 -28 64 ) common/clip 192 0 0 0.25 0.25 0 0 0
 }
 {
 ( -192 584 128 ) ( -192 560 128 ) ( -352 584 128 ) common/clip 0 0 0 0.25 0.25 0 0 0
@@ -11741,7 +11741,7 @@ trak5x/base-pipe1d
 }
 {
 "classname" "misc_breakablemodel"
-"origin" "220.000061 -60.000061 16.000000"
+"origin" "220.000061 -44.000061 16.000000"
 "model" "models/containers/barrel01.md3"
 "angle" "-125.322510"
 "count" "1"
diff --git a/maps/drain.map.options b/maps/drain.map.options
index c661ab55..d7ee687e 100644
--- a/maps/drain.map.options
+++ b/maps/drain.map.options
@@ -4,4 +4,4 @@
 -vis +
 -minimap +
 -nosRGB
-Version: 10
+Version: 11