fix some annoying movement obstacles.

diff --git a/maps/fuse.map b/maps/fuse.map
index 283d8f3317ab0d42e7633b7792c9599bc8ca15e2..35bd48e490a1cd7a046cfff7db8daa548176efda 100644 (file)
--- a/maps/fuse.map
+++ b/maps/fuse.map
@@ -7325,21 +7325,12 @@ phillipk2x/natural-pk02_rock01
 {
 brushDef
 {
-<<<<<<< HEAD
 ( 208 -208 -448 ) ( 216 -208 -168 ) ( 200 -208 -448 ) ( ( 0.015625 0 0.125 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
 ( 208 -224 -448 ) ( 224 -208 -168 ) ( 208 -208 -448 ) ( ( 0.03125 0 7 ) ( 0 0.0202700961 1020.9189453125 ) ) common/clip 134217728 0 0
 ( 208 -208 -448 ) ( 200 -224 -448 ) ( 208 -224 -448 ) ( ( 0.015625 0 1.5 ) ( 0 0.015625 0.125 ) ) common/clip 134217728 0 0
 ( 208 -208 -168 ) ( 208 -224 -168 ) ( 200 -224 -448 ) ( ( 0.015625 0 254.5 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
 ( 208 -224 -168 ) ( 208 -208 -168 ) ( 224 -224 -168 ) ( ( 0.015625 0 0.25 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
 ( 224 -208 -64 ) ( 200 -224 -64 ) ( 224 -208 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 134217728 0 0
-=======
-( 208 -192 -448 ) ( 216 -192 -168 ) ( 200 -192 -448 ) ( ( 0.125 0 1 ) ( 0 0.0078125 0 ) ) exx/trim-vert01 134217728 0 0
-( 208 -208 -448 ) ( 224 -192 -168 ) ( 208 -192 -448 ) ( ( 0.0625 0 13 ) ( 0 0.0101350481 510.4594726563 ) ) exx/trim-metalsupp01 134217728 0 0
-( 208 -192 -448 ) ( 200 -208 -448 ) ( 208 -208 -448 ) ( ( 0.015625 0 1.25 ) ( 0 0.015625 0.125 ) ) common/caulk 134217728 0 0
-( 208 -208 -448 ) ( 200 -208 -448 ) ( 224 -208 -168 ) ( ( 0.125 0 31 ) ( 0 0.0078125 0 ) ) exx/trim-vert01 134217728 0 0
-( 208 -192 -168 ) ( 208 -208 -168 ) ( 200 -208 -448 ) ( ( 0.015625 0 254.75 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
-( 208 -208 -168 ) ( 208 -192 -168 ) ( 224 -208 -168 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
->>>>>>> f4bd74aa82e2339c71b62b85513f471dcb193b99
 }
 }
 {
@@ -7410,21 +7401,12 @@ brushDef
 {
 brushDef
 {
-<<<<<<< HEAD
 ( 420 -176 -160 ) ( 420 -192 -160 ) ( 384 -192 -160 ) ( ( 0.015625 0 255.75 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
 ( 408 -176 -160 ) ( 384 -176 -160 ) ( 408 -176 -168 ) ( ( 0 0.125 0 ) ( -0.0078125 0 0 ) ) exx/trim-vert01 134217728 0 0
 ( 382 -192 -160 ) ( 382 -176 -160 ) ( 378 -192 -168 ) ( ( 0.015625 0 255.75 ) ( 0 0.015625 255.7344665527 ) ) common/caulk 134217728 0 0
 ( 384 -192 -168 ) ( 408 -192 -168 ) ( 384 -176 -168 ) ( ( 0.0625 0 115 ) ( 0 0.0101350481 510.4594726563 ) ) exx/trim-metalsupp01 134217728 0 0
 ( 384 -192 -168 ) ( 384 -192 -160 ) ( 408 -192 -168 ) ( ( 0 0.125 0 ) ( -0.0078125 0 0 ) ) exx/trim-vert01 134217728 0 0
 ( 192 -184 -168 ) ( 192 -168 -168 ) ( 192 -184 -160 ) ( ( 0.015625 0 0.375 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
-=======
-( 420 -192 -160 ) ( 420 -208 -160 ) ( 384 -208 -160 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
-( 408 -192 -160 ) ( 384 -192 -160 ) ( 408 -192 -168 ) ( ( 0 0.125 0 ) ( -0.0078125 0 0 ) ) exx/trim-vert01 134217728 0 0
-( 420 -208 -160 ) ( 420 -192 -160 ) ( 416 -208 -168 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
-( 384 -208 -168 ) ( 408 -208 -168 ) ( 384 -192 -168 ) ( ( 0.0625 0 116 ) ( 0 0.0101350481 510.4594726563 ) ) exx/trim-metalsupp01 134217728 0 0
-( 384 -208 -168 ) ( 384 -208 -160 ) ( 408 -208 -168 ) ( ( 0 0.125 0 ) ( -0.0078125 0 0 ) ) exx/trim-vert01 134217728 0 0
-( 192 -200 -168 ) ( 192 -184 -168 ) ( 192 -200 -160 ) ( ( 0.015625 0 0.125 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
->>>>>>> f4bd74aa82e2339c71b62b85513f471dcb193b99
 }
 }
 {
@@ -13433,19 +13415,11 @@ brushDef
 brushDef
 {
 ( 80 136 160 ) ( 80 128 160 ) ( 64 136 160 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
-<<<<<<< HEAD
 ( 64 128 -128 ) ( 80 128 -128 ) ( 64 136 -128 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
 ( 64 128 -128 ) ( 64 128 96 ) ( 80 128 -128 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
 ( 64 128 -128 ) ( 64 136 -128 ) ( 64 128 96 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
 ( 66 144 -64 ) ( 80 128 -64 ) ( 66 144 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
 ( 64 136 -64 ) ( 72 136 -64 ) ( 64 136 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
-=======
-( 68 136 -128 ) ( 68 136 160 ) ( 64 136 160 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
-( 68 136 160 ) ( 68 136 -128 ) ( 80 128 -128 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
-( 64 128 -128 ) ( 80 128 -128 ) ( 64 136 -128 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
-( 64 128 -128 ) ( 64 128 96 ) ( 80 128 -128 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
-( 64 128 -128 ) ( 64 136 -128 ) ( 64 128 96 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
->>>>>>> f4bd74aa82e2339c71b62b85513f471dcb193b99
 }
 }
 {
@@ -27730,7 +27704,6 @@ brushDef
 ( -632 -1104 -320 ) ( -632 -1104 -256 ) ( -584 -1104 -320 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
 ( -632 -1104 -320 ) ( -632 -1096 -320 ) ( -632 -1104 -256 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
 ( -64 -1104 -264 ) ( -64 -1096 -256 ) ( 64 -1104 -264 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
-<<<<<<< HEAD
 }
 }
 {
@@ -28309,8 +28282,6 @@ brushDef
 ( -1216 -832 196 ) ( -1216 -832 64 ) ( -1216 -840 196 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
 ( -1218 -840 64 ) ( -1216 -840 64 ) ( -1218 -832 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
 ( -1216 -840 -64 ) ( -1218 -832 -64 ) ( -1216 -840 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
-=======
->>>>>>> f4bd74aa82e2339c71b62b85513f471dcb193b99
 }
 }
 }
@@ -31118,7 +31089,7 @@ brushDef
 ( -704 -416 256 ) ( -688 -400 256 ) ( -680 -408 256 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
 ( -680 -408 244 ) ( -680 -408 256 ) ( -684 -404 256 ) ( ( 0 0.0833333358 21.3333339691 ) ( -0.0049104635 0 1 ) ) exx/trim-vert01 134217728 0 0
 ( -400 -680 244 ) ( -416 -696 244 ) ( -412 -700 256 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
-( -420 -700 244 ) ( -404 -684 244 ) ( -684 -404 244 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
+( -420 -700 244 ) ( -404 -684 244 ) ( -684 -404 244 ) ( ( 0.03125 0 0 ) ( 0 0.0078125 0 ) ) exx/trim-metalsupp01 134217728 0 0
 ( -692 -420 256 ) ( -692 -420 244 ) ( -696 -416 256 ) ( ( 0 0.0833333358 21.3333339691 ) ( -0.0049104639 0 1 ) ) exx/trim-vert01 134217728 0 0
 ( -684 -396 256 ) ( -700 -412 256 ) ( -696 -416 244 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
 }
@@ -31184,7 +31155,7 @@ brushDef
 ( -820 -532 256 ) ( -804 -516 256 ) ( -796 -524 256 ) ( ( 0.015625 0 1.8125 ) ( 0 0.015625 1.8125 ) ) common/caulk 134217728 0 0
 ( -796 -524 244 ) ( -796 -524 256 ) ( -800 -520 256 ) ( ( 0 0.0833333358 21.3333339691 ) ( -0.0049104635 0 1 ) ) exx/trim-vert01 134217728 0 0
 ( -516 -796 244 ) ( -532 -812 244 ) ( -528 -816 256 ) ( ( 0.015625 0 2.5632619858 ) ( 0 0.015625 0.0000000258 ) ) common/caulk 134217728 0 0
-( -536 -816 244 ) ( -520 -800 244 ) ( -800 -520 244 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
+( -536 -816 244 ) ( -520 -800 244 ) ( -800 -520 244 ) ( ( 0.03125 0 0 ) ( 0 0.0078125 0 ) ) exx/trim-metalsupp01 134217728 0 0
 ( -808 -536 256 ) ( -808 -536 244 ) ( -812 -532 256 ) ( ( 0 0.0833333358 21.3333339691 ) ( -0.0049104639 0 1 ) ) exx/trim-vert01 134217728 0 0
 ( -800 -512 256 ) ( -816 -528 256 ) ( -812 -532 244 ) ( ( 0.015625 0 253.4367370605 ) ( 0 0.015625 256 ) ) common/caulk 134217728 0 0
 }
@@ -34552,7 +34523,7 @@ brushDef
 }
 {
 "classname" "info_player_deathmatch"
-"origin" "32.000000 -672.000000 -96.000000"
+"origin" "32.000000 -672.000000 -104.000000"
 "angle" "90.000000"
 }
 {

diff --git a/maps/fuse.map.options b/maps/fuse.map.options
index 149a481cba1a0272c59e601f06bfa79a4c8dabe4..714034c6a7ba4606d7bf32ef93568a2559d03f8f 100644 (file)
--- a/maps/fuse.map.options
+++ b/maps/fuse.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -sRGB
-Version: 4
+Version: 5