From 9980bc3e543b3f0e719c9557ac4928ebdf2038d4 Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Wed, 13 Oct 2010 19:30:30 +0300 Subject: [PATCH] lab610 to lab-610, part 2 --- maps/lab-610.map | 40 ++++++++++++++++++------------------ scripts/map_lab-610.shader | 42 +++++++++++++++++++------------------- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/maps/lab-610.map b/maps/lab-610.map index a1585f81..5efe3070 100644 --- a/maps/lab-610.map +++ b/maps/lab-610.map @@ -553,7 +553,7 @@ exx/trim-vert01 { patchDef2 { -lab610/env1 +map_lab-610/env1 ( 3 3 0 0 0 ) ( ( ( 368 288 32 0 0 ) ( 368 288 112 0 1 ) ( 368 288 192 0 2 ) ) @@ -782,7 +782,7 @@ exx/trim-vert01 { patchDef2 { -lab610/env1 +map_lab-610/env1 ( 3 3 0 0 0 ) ( ( ( 128 368 192 0 0 ) ( 128 368 112 0 1 ) ( 128 368 32 0 2 ) ) @@ -795,7 +795,7 @@ lab610/env1 { patchDef2 { -lab610/env1 +map_lab-610/env1 ( 3 3 0 0 0 ) ( ( ( 368 288 192 0 0 ) ( 368 288 112 0 1 ) ( 368 288 32 0 2 ) ) @@ -808,7 +808,7 @@ lab610/env1 { patchDef2 { -lab610/env1 +map_lab-610/env1 ( 3 3 0 0 0 ) ( ( ( 288 -368 32 0 0 ) ( 288 -368 112 0 1 ) ( 288 -368 192 0 2 ) ) @@ -821,7 +821,7 @@ lab610/env1 { patchDef2 { -lab610/env1 +map_lab-610/env1 ( 3 3 0 0 0 ) ( ( ( 368 -128 192 0 0 ) ( 368 -128 112 0 1 ) ( 368 -128 32 0 2 ) ) @@ -834,7 +834,7 @@ lab610/env1 { patchDef2 { -lab610/env1 +map_lab-610/env1 ( 3 3 0 0 0 ) ( ( ( 288 -368 192 0 0 ) ( 288 -368 112 0 1 ) ( 288 -368 32 0 2 ) ) @@ -847,7 +847,7 @@ lab610/env1 { patchDef2 { -lab610/env1 +map_lab-610/env1 ( 3 3 0 0 0 ) ( ( ( -288 368 32 0 0 ) ( -288 368 112 0 1 ) ( -288 368 192 0 2 ) ) @@ -860,7 +860,7 @@ lab610/env1 { patchDef2 { -lab610/env1 +map_lab-610/env1 ( 3 3 0 0 0 ) ( ( ( -368 128 192 0 0 ) ( -368 128 112 0 1 ) ( -368 128 32 0 2 ) ) @@ -873,7 +873,7 @@ lab610/env1 { patchDef2 { -lab610/env1 +map_lab-610/env1 ( 3 3 0 0 0 ) ( ( ( -288 368 192 0 0 ) ( -288 368 112 0 1 ) ( -288 368 32 0 2 ) ) @@ -8460,7 +8460,7 @@ exx/trim-01 { patchDef2 { -lab610/env1 +map_lab-610/env1 ( 3 3 0 0 0 ) ( ( ( -368 -288 32 0 0 ) ( -368 -288 112 0 1 ) ( -368 -288 192 0 2 ) ) @@ -8473,7 +8473,7 @@ lab610/env1 { patchDef2 { -lab610/env1 +map_lab-610/env1 ( 3 3 0 0 0 ) ( ( ( -128 -368 192 0 0 ) ( -128 -368 112 0 1 ) ( -128 -368 32 0 2 ) ) @@ -8486,7 +8486,7 @@ lab610/env1 { patchDef2 { -lab610/env1 +map_lab-610/env1 ( 3 3 0 0 0 ) ( ( ( -368 -288 192 0 0 ) ( -368 -288 112 0 1 ) ( -368 -288 32 0 2 ) ) @@ -35708,7 +35708,7 @@ trak5x/base-pipe1a { patchDef2 { -lab610/warp6 +map_lab-610/warp6 ( 3 3 0 0 0 ) ( ( ( -1984 -48 40 0 0 ) ( -1984 -48 104 0 -0.4999999404 ) ( -1984 -48 168 0 -0.9999998808 ) ) @@ -35721,7 +35721,7 @@ lab610/warp6 { patchDef2 { -lab610/warp1 +map_lab-610/warp1 ( 3 3 0 0 0 ) ( ( ( -1984 -48 168 0 0 ) ( -1984 -48 104 0 0.5 ) ( -1984 -48 40 0 1 ) ) @@ -35734,7 +35734,7 @@ lab610/warp1 { patchDef2 { -lab610/warp5 +map_lab-610/warp5 ( 3 3 0 0 0 ) ( ( ( 1984 -48 168 0 0 ) ( 1984 -48 104 0 0.5 ) ( 1984 -48 40 0 1 ) ) @@ -35747,7 +35747,7 @@ lab610/warp5 { patchDef2 { -lab610/warp2 +map_lab-610/warp2 ( 3 3 0 0 0 ) ( ( ( 1984 -48 40 0 0 ) ( 1984 -48 104 0 -0.4999999404 ) ( 1984 -48 168 0 -0.9999998808 ) ) @@ -35760,7 +35760,7 @@ lab610/warp2 { patchDef2 { -lab610/warp4 +map_lab-610/warp4 ( 3 3 0 0 0 ) ( ( ( 768 -1408 40 0 0 ) ( 768 -1408 104 0 -0.4999999404 ) ( 768 -1408 168 0 -0.9999998808 ) ) @@ -35773,7 +35773,7 @@ lab610/warp4 { patchDef2 { -lab610/warp3 +map_lab-610/warp3 ( 3 3 0 0 0 ) ( ( ( -768 -1408 168 0 0 ) ( -768 -1408 104 0 0.5 ) ( -768 -1408 40 0 1 ) ) @@ -40794,14 +40794,14 @@ exx/trim-baseboard03 { "classname" "target_speaker" "origin" "-948.000000 -4676.000000 728.000000" -"noise" "sound/lab610/speaker_voice.wav" +"noise" "sound/map_lab-610/speaker_voice.wav" "atten" "0.5" } // entity 325 { "classname" "target_speaker" "origin" "-1272.000000 0.000000 168.000000" -"noise" "sound/lab610/speaker_voice.wav" +"noise" "sound/map_lab-610/speaker_voice.wav" "atten" "1" } // entity 326 diff --git a/scripts/map_lab-610.shader b/scripts/map_lab-610.shader index 830f71e3..5655683a 100644 --- a/scripts/map_lab-610.shader +++ b/scripts/map_lab-610.shader @@ -1,11 +1,11 @@ -textures/lab610/env1 +textures/map_lab-610/env1 { - qer_editorimage textures/lab610/env1.tga + qer_editorimage textures/map_lab-610/env1.tga surfaceparm trans cull disable qer_trans 0.5 { - map textures/lab610/env1.tga + map textures/map_lab-610/env1.tga blendfunc GL_ONE GL_ONE //rgbGen vertex tcgen environment @@ -18,80 +18,80 @@ textures/lab610/env1 }*/ } -textures/lab610/warp1 +textures/map_lab-610/warp1 { - qer_editorimage textures/lab610/warp1.tga + qer_editorimage textures/map_lab-610/warp1.tga surfaceparm nolightmap surfaceparm nonsolid surfaceparm noimpact surfaceparm nomarks { - map textures/lab610/warp1.tga + map textures/map_lab-610/warp1.tga blendfunc blend } } -textures/lab610/warp2 +textures/map_lab-610/warp2 { - qer_editorimage textures/lab610/warp2.tga + qer_editorimage textures/map_lab-610/warp2.tga surfaceparm nolightmap surfaceparm nonsolid surfaceparm noimpact surfaceparm nomarks { - map textures/lab610/warp2.tga + map textures/map_lab-610/warp2.tga blendfunc blend } } -textures/lab610/warp3 +textures/map_lab-610/warp3 { - qer_editorimage textures/lab610/warp3.tga + qer_editorimage textures/map_lab-610/warp3.tga surfaceparm nolightmap surfaceparm nonsolid surfaceparm noimpact surfaceparm nomarks { - map textures/lab610/warp3.tga + map textures/map_lab-610/warp3.tga blendfunc blend } } -textures/lab610/warp4 +textures/map_lab-610/warp4 { - qer_editorimage textures/lab610/warp4.tga + qer_editorimage textures/map_lab-610/warp4.tga surfaceparm nolightmap surfaceparm nonsolid surfaceparm noimpact surfaceparm nomarks { - map textures/lab610/warp4.tga + map textures/map_lab-610/warp4.tga blendfunc blend } } -textures/lab610/warp5 +textures/map_lab-610/warp5 { - qer_editorimage textures/lab610/warp5.tga + qer_editorimage textures/map_lab-610/warp5.tga surfaceparm nolightmap surfaceparm nonsolid surfaceparm noimpact surfaceparm nomarks { - map textures/lab610/warp5.tga + map textures/map_lab-610/warp5.tga blendfunc blend } } -textures/lab610/warp6 +textures/map_lab-610/warp6 { - qer_editorimage textures/lab610/warp6.tga + qer_editorimage textures/map_lab-610/warp6.tga surfaceparm nolightmap surfaceparm nonsolid surfaceparm noimpact surfaceparm nomarks { - map textures/lab610/warp6.tga + map textures/map_lab-610/warp6.tga blendfunc blend } } \ No newline at end of file -- 2.39.5