Add elevator screens, and fix a screen texture

diff --git a/maps/red-planet.map b/maps/red-planet.map
index e6b931ffb37041ce49fed0a002dc65775a253e8e..df0a01bf19a5d87007cd3842bcc175fba07adb47 100644 (file)
--- a/maps/red-planet.map
+++ b/maps/red-planet.map
@@ -36092,16 +36092,16 @@ exx/floor-metal02
 }\r
 // brush 2779\r
 {\r
-( -2144 -384 109 ) ( -2144 -416 109 ) ( -2176 -384 109 ) common/weapclip 0 0 0 0.25 0.25 134217728 0 0\r
-( -2144 -384 66 ) ( -2176 -384 66 ) ( -2144 -384 64 ) common/weapclip 0 0 0 0.25 0.25 134217728 0 0\r
-( -2144 -384 66 ) ( -2144 -384 64 ) ( -2144 -416 66 ) common/weapclip 0 0 0 0.25 0.25 134217728 0 0\r
-( -2176 -416 64 ) ( -2144 -416 64 ) ( -2176 -384 64 ) common/weapclip 0 0 0 0.25 0.25 134217728 0 0\r
-( -2176 -416 64 ) ( -2176 -416 66 ) ( -2144 -416 64 ) common/weapclip 0 0 0 0.25 0.25 134217728 0 0\r
-( -2176 -416 64 ) ( -2176 -384 64 ) ( -2176 -416 66 ) common/weapclip 0 0 0 0.25 0.25 134217728 0 0\r
-( -2176 -394 -64 ) ( -2166 -384 -64 ) ( -2176 -394 64 ) common/weapclip 0 0 0 0.25 0.25 134217728 0 0\r
-( -2154 -384 -64 ) ( -2144 -394 -64 ) ( -2154 -384 64 ) common/weapclip 0 0 0 0.25 0.25 134217728 0 0\r
-( -2144 -406 -64 ) ( -2154 -416 -64 ) ( -2144 -406 64 ) common/weapclip 0 0 0 0.25 0.25 134217728 0 0\r
-( -2166 -416 -64 ) ( -2176 -406 -64 ) ( -2166 -416 64 ) common/weapclip 0 0 0 0.25 0.25 134217728 0 0\r
+( -2144 -392 109 ) ( -2144 -424 109 ) ( -2176 -392 109 ) common/weapclip 0 224 0 0.25 0.25 134217728 0 0\r
+( -2144 -392 66 ) ( -2176 -392 66 ) ( -2144 -392 64 ) common/weapclip 0 0 0 0.25 0.25 134217728 0 0\r
+( -2144 -392 66 ) ( -2144 -392 64 ) ( -2144 -424 66 ) common/weapclip 32 0 0 0.25 0.25 134217728 0 0\r
+( -2176 -424 64 ) ( -2144 -424 64 ) ( -2176 -392 64 ) common/weapclip 0 224 0 0.25 0.25 134217728 0 0\r
+( -2176 -424 64 ) ( -2176 -424 66 ) ( -2144 -424 64 ) common/weapclip 0 0 0 0.25 0.25 134217728 0 0\r
+( -2176 -424 64 ) ( -2176 -392 64 ) ( -2176 -424 66 ) common/weapclip 32 0 0 0.25 0.25 134217728 0 0\r
+( -2176 -402 -64 ) ( -2166 -392 -64 ) ( -2176 -402 64 ) common/weapclip 32 0 0 0.25 0.25 134217728 0 0\r
+( -2154 -392 -64 ) ( -2144 -402 -64 ) ( -2154 -392 64 ) common/weapclip 32 0 0 0.25 0.25 134217728 0 0\r
+( -2144 -414 -64 ) ( -2154 -424 -64 ) ( -2144 -414 64 ) common/weapclip 32 0 0 0.25 0.25 134217728 0 0\r
+( -2166 -424 -64 ) ( -2176 -414 -64 ) ( -2166 -424 64 ) common/weapclip 32 0 0 0.25 0.25 134217728 0 0\r
 }\r
 // brush 2780\r
 {\r
@@ -44420,7 +44420,7 @@ trak5x/misc-glass
 ( -2832 -44 464 ) ( -2832 -52 472 ) ( -2832 -44 472 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0\r
 ( -2836 -40 464 ) ( -2832 -40 456 ) ( -2832 -40 464 ) exx/base-metal04 -0 0 0 0.5 0.5 134217728 0 0\r
 ( -2832 -52 456 ) ( -2836 -44 456 ) ( -2836 -52 456 ) common/caulk -0 0 0 0.5 0.5 134217728 0 0\r
-( -2834 -44 464 ) ( -2834 -52 472 ) ( -2834 -52 464 ) screens/screen_airlock1 256 256 0 -0.03125 0.03125 134217728 0 0\r
+( -2834 -44 464 ) ( -2834 -52 472 ) ( -2834 -52 464 ) screens/screen_door1 256 256 0 -0.03125 0.03125 134217728 0 0\r
 ( -2836 -56 472 ) ( -2832 -56 464 ) ( -2836 -56 464 ) exx/base-metal04 -0 0 0 0.5 0.5 134217728 0 0\r
 }\r
 // brush 17\r
@@ -50729,7 +50729,7 @@ exx/trim-vert01
 // entity 570\r
 {\r
 "classname" "misc_gamemodel"\r
-"origin" "-2160.000000 -399.999939 64.000000"\r
+"origin" "-2160.000000 -407.999939 64.000000"\r
 "model" "models/containers/barrel01.md3"\r
 "_castShadows" "1"\r
 "angle" "-30.000011"\r
@@ -51400,3 +51400,119 @@ exx/trim-vert01
 "_castShadows" "1"\r
 "angle" "45.000000"\r
 }\r
+// entity 669\r
+{\r
+"classname" "func_group"\r
+// brush 0\r
+{\r
+( -3200 -64 140 ) ( -3212 -76 136 ) ( -3212 -76 140 ) common/caulk 176 32 0 0.5 0.5 134217728 0 0\r
+( -3212 -76 136 ) ( -3214 -74 136 ) ( -3212 -76 140 ) exx/base-metal04 32 32 0 0.5 0.5 134217728 0 0\r
+( -3200 -64 136 ) ( -3214 -74 136 ) ( -3212 -76 136 ) exx/base-metal04 176 480 0 0.5 0.5 134217728 0 0\r
+( -3200 -64 140 ) ( -3202 -62 136 ) ( -3200 -64 136 ) exx/base-metal04 32 32 0 0.5 0.5 134217728 0 0\r
+( -3200 -64 140 ) ( -3212 -76 140 ) ( -3214 -74 136 ) exx/base-metal04 176 480 0 0.5 0.5 134217728 0 0\r
+}\r
+// brush 1\r
+{\r
+( -3200 -64 120 ) ( -3212 -76 116 ) ( -3212 -76 120 ) common/caulk 176 32 0 0.5 0.5 134217728 0 0\r
+( -3212 -76 116 ) ( -3214 -74 120 ) ( -3212 -76 120 ) exx/base-metal04 32 32 0 0.5 0.5 134217728 0 0\r
+( -3200 -64 120 ) ( -3212 -76 120 ) ( -3214 -74 120 ) exx/base-metal04 176 480 0 0.5 0.5 134217728 0 0\r
+( -3200 -64 120 ) ( -3202 -62 120 ) ( -3200 -64 116 ) exx/base-metal04 32 32 0 0.5 0.5 134217728 0 0\r
+( -3202 -62 120 ) ( -3214 -74 120 ) ( -3212 -76 116 ) exx/base-metal04 176 480 0 0.5 0.5 134217728 0 0\r
+}\r
+// brush 2\r
+{\r
+( -3200 -64 136 ) ( -3212 -76 136 ) ( -3213 -75 136 ) common/caulk 176 224 0 0.5 0.5 134217728 0 0\r
+( -3200 -64 136 ) ( -3212 -76 120 ) ( -3212 -76 136 ) common/caulk 176 32 0 0.5 0.5 134217728 0 0\r
+( -3212 -76 136 ) ( -3213 -75 120 ) ( -3213 -75 136 ) exx/base-metal04 32 32 0 0.5 0.5 134217728 0 0\r
+( -3200 -64 120 ) ( -3213 -75 120 ) ( -3212 -76 120 ) common/caulk 176 224 0 0.5 0.5 134217728 0 0\r
+( -3201 -63 136 ) ( -3213 -75 136 ) ( -3213 -75 120 ) screens/screen_elevator1 384.0007324219 256 0 -0.0234375056 0.03125 134217728 0 0\r
+( -3200 -64 120 ) ( -3201 -63 136 ) ( -3201 -63 120 ) exx/base-metal04 32 32 0 0.5 0.5 134217728 0 0\r
+}\r
+}\r
+// entity 670\r
+{\r
+"classname" "func_group"\r
+// brush 0\r
+{\r
+( -3056 92 480 ) ( -3056 76 480 ) ( -3056 92 464 ) common/caulk 240 0 0 0.5 0.5 134217728 0 0\r
+( -3096 96 488 ) ( -3096 96 472 ) ( -3048 96 488 ) exx/base-metal04 0 0 0 -0.5 0.5 134217728 0 0\r
+( -3048 76 472 ) ( -3048 92 472 ) ( -3096 76 472 ) exx/base-metal04 0 272 0 -0.5 0.5 134217728 0 0\r
+( -3048 80 464 ) ( -3096 80 464 ) ( -3048 80 480 ) exx/base-metal04 0 0 0 -0.5 0.5 134217728 0 0\r
+( -3056 -312 476 ) ( -3052 -440 472 ) ( -3056 -440 476 ) exx/base-metal04 0 272 0 -0.5 0.5 134217728 0 0\r
+}\r
+// brush 1\r
+{\r
+( -3056 92 464 ) ( -3056 76 448 ) ( -3056 92 448 ) common/caulk 240 0 0 0.5 0.5 134217728 0 0\r
+( -3048 96 440 ) ( -3096 96 456 ) ( -3096 96 440 ) exx/base-metal04 0 0 0 -0.5 0.5 134217728 0 0\r
+( -3096 76 456 ) ( -3048 92 456 ) ( -3048 76 456 ) exx/base-metal04 0 272 0 -0.5 0.5 134217728 0 0\r
+( -3048 80 448 ) ( -3096 80 464 ) ( -3048 80 464 ) exx/base-metal04 0 0 0 -0.5 0.5 134217728 0 0\r
+( -3056 -440 452 ) ( -3052 -440 456 ) ( -3056 -312 452 ) exx/base-metal04 0 272 0 -0.5 0.5 134217728 0 0\r
+}\r
+// brush 2\r
+{\r
+( -3056 92 472 ) ( -3052 92 472 ) ( -3056 84 472 ) common/caulk 0 16 0 -0.5 0.5 134217728 0 0\r
+( -3056 92 472 ) ( -3056 84 472 ) ( -3056 92 464 ) common/caulk 240 0 0 0.5 0.5 134217728 0 0\r
+( -3056 96 464 ) ( -3056 96 456 ) ( -3052 96 464 ) exx/base-metal04 0 0 0 -0.5 0.5 134217728 0 0\r
+( -3052 84 456 ) ( -3052 92 456 ) ( -3056 84 456 ) common/caulk 0 16 0 -0.5 0.5 134217728 0 0\r
+( -3054 84 464 ) ( -3054 84 472 ) ( -3054 92 464 ) screens/screen_elevator1 -0 256 0 0.03125 0.03125 134217728 0 0\r
+( -3052 80 464 ) ( -3056 80 464 ) ( -3052 80 472 ) exx/base-metal04 0 0 0 -0.5 0.5 134217728 0 0\r
+}\r
+}\r
+// entity 671\r
+{\r
+"classname" "func_group"\r
+// brush 0\r
+{\r
+( -2164 -384 128 ) ( -2180 -384 128 ) ( -2164 -384 112 ) common/caulk 48 0 0 0.5 0.5 134217728 0 0\r
+( -2160 -344 136 ) ( -2160 -344 120 ) ( -2160 -392 136 ) exx/base-metal04 224 0 0 -0.5 0.5 134217728 0 0\r
+( -2180 -392 120 ) ( -2164 -392 120 ) ( -2180 -344 120 ) exx/base-metal04 224 464 -90 0.5 0.5 134217728 0 0\r
+( -2176 -392 112 ) ( -2176 -344 112 ) ( -2176 -392 128 ) exx/base-metal04 224 0 0 -0.5 0.5 134217728 0 0\r
+( -2568 -384 124 ) ( -2696 -388 120 ) ( -2696 -384 124 ) exx/base-metal04 224 464 -90 0.5 0.5 134217728 0 0\r
+}\r
+// brush 1\r
+{\r
+( -2164 -384 112 ) ( -2180 -384 96 ) ( -2164 -384 96 ) common/caulk 48 0 0 0.5 0.5 134217728 0 0\r
+( -2160 -392 88 ) ( -2160 -344 104 ) ( -2160 -344 88 ) exx/base-metal04 224 0 0 -0.5 0.5 134217728 0 0\r
+( -2180 -344 104 ) ( -2164 -392 104 ) ( -2180 -392 104 ) exx/base-metal04 224 464 -90 0.5 0.5 134217728 0 0\r
+( -2176 -392 96 ) ( -2176 -344 112 ) ( -2176 -392 112 ) exx/base-metal04 224 0 0 -0.5 0.5 134217728 0 0\r
+( -2696 -384 100 ) ( -2696 -388 104 ) ( -2568 -384 100 ) exx/base-metal04 224 464 -90 0.5 0.5 134217728 0 0\r
+}\r
+// brush 2\r
+{\r
+( -2164 -384 120 ) ( -2164 -388 120 ) ( -2172 -384 120 ) common/caulk 224 208 -90 0.5 0.5 134217728 0 0\r
+( -2164 -384 120 ) ( -2172 -384 120 ) ( -2164 -384 112 ) common/caulk 48 0 0 0.5 0.5 134217728 0 0\r
+( -2160 -384 112 ) ( -2160 -384 104 ) ( -2160 -388 112 ) exx/base-metal04 224 0 0 -0.5 0.5 134217728 0 0\r
+( -2172 -388 104 ) ( -2164 -388 104 ) ( -2172 -384 104 ) common/caulk 224 208 -90 0.5 0.5 134217728 0 0\r
+( -2172 -386 112 ) ( -2172 -386 120 ) ( -2164 -386 112 ) screens/screen_elevator1 0 256 0 0.03125 0.03125 134217728 0 0\r
+( -2176 -388 112 ) ( -2176 -384 112 ) ( -2176 -388 120 ) exx/base-metal04 224 0 0 -0.5 0.5 134217728 0 0\r
+}\r
+}\r
+// entity 672\r
+{\r
+"classname" "func_group"\r
+// brush 0\r
+{\r
+( -2308 -240 464 ) ( -2324 -240 480 ) ( -2308 -240 480 ) common/caulk 80 192 0 0.5 0.5 134217728 0 0\r
+( -2304 -232 488 ) ( -2304 -280 472 ) ( -2304 -280 488 ) exx/base-metal04 448 192 0 0.5 0.5 134217728 0 0\r
+( -2324 -280 472 ) ( -2308 -232 472 ) ( -2324 -232 472 ) exx/base-metal04 448 176 90 0.5 -0.5 134217728 0 0\r
+( -2320 -232 480 ) ( -2320 -280 464 ) ( -2320 -232 464 ) exx/base-metal04 448 192 0 0.5 0.5 134217728 0 0\r
+( -2840 -240 476 ) ( -2840 -236 472 ) ( -2712 -240 476 ) exx/base-metal04 448 176 90 0.5 -0.5 134217728 0 0\r
+}\r
+// brush 1\r
+{\r
+( -2308 -240 448 ) ( -2324 -240 448 ) ( -2308 -240 464 ) common/caulk 80 192 0 0.5 0.5 134217728 0 0\r
+( -2304 -280 440 ) ( -2304 -280 456 ) ( -2304 -232 440 ) exx/base-metal04 448 192 0 0.5 0.5 134217728 0 0\r
+( -2324 -232 456 ) ( -2308 -232 456 ) ( -2324 -280 456 ) exx/base-metal04 448 176 90 0.5 -0.5 134217728 0 0\r
+( -2320 -232 464 ) ( -2320 -280 464 ) ( -2320 -232 448 ) exx/base-metal04 448 192 0 0.5 0.5 134217728 0 0\r
+( -2712 -240 452 ) ( -2840 -236 456 ) ( -2840 -240 452 ) exx/base-metal04 448 176 90 0.5 -0.5 134217728 0 0\r
+}\r
+// brush 2\r
+{\r
+( -2316 -240 472 ) ( -2308 -236 472 ) ( -2308 -240 472 ) common/caulk 192 176 90 0.5 -0.5 134217728 0 0\r
+( -2308 -240 464 ) ( -2316 -240 472 ) ( -2308 -240 472 ) common/caulk 80 192 0 0.5 0.5 134217728 0 0\r
+( -2304 -236 464 ) ( -2304 -240 456 ) ( -2304 -240 464 ) exx/base-metal04 448 192 0 0.5 0.5 134217728 0 0\r
+( -2316 -240 456 ) ( -2308 -236 456 ) ( -2316 -236 456 ) common/caulk 192 176 90 0.5 -0.5 134217728 0 0\r
+( -2308 -238 464 ) ( -2316 -238 472 ) ( -2316 -238 464 ) screens/screen_elevator1 -0 256 0 -0.03125 0.03125 134217728 0 0\r
+( -2320 -236 472 ) ( -2320 -240 464 ) ( -2320 -236 464 ) exx/base-metal04 448 192 0 0.5 0.5 134217728 0 0\r
+}\r
+}\r