lab610 to lab-610, part 2

diff --git a/maps/lab-610.map b/maps/lab-610.map
index a1585f8127f037a79c0dfe98f033d1541ef98893..5efe3070208482483f0d0b11ed8bad12a3db4e9e 100644 (file)
--- a/maps/lab-610.map
+++ b/maps/lab-610.map
@@ -553,7 +553,7 @@ exx/trim-vert01
 {\r
 patchDef2\r
 {\r
-lab610/env1\r
+map_lab-610/env1\r
 ( 3 3 0 0 0 )\r
 (\r
 ( ( 368 288 32 0 0 ) ( 368 288 112 0 1 ) ( 368 288 192 0 2 ) )\r
@@ -782,7 +782,7 @@ exx/trim-vert01
 {\r
 patchDef2\r
 {\r
-lab610/env1\r
+map_lab-610/env1\r
 ( 3 3 0 0 0 )\r
 (\r
 ( ( 128 368 192 0 0 ) ( 128 368 112 0 1 ) ( 128 368 32 0 2 ) )\r
@@ -795,7 +795,7 @@ lab610/env1
 {\r
 patchDef2\r
 {\r
-lab610/env1\r
+map_lab-610/env1\r
 ( 3 3 0 0 0 )\r
 (\r
 ( ( 368 288 192 0 0 ) ( 368 288 112 0 1 ) ( 368 288 32 0 2 ) )\r
@@ -808,7 +808,7 @@ lab610/env1
 {\r
 patchDef2\r
 {\r
-lab610/env1\r
+map_lab-610/env1\r
 ( 3 3 0 0 0 )\r
 (\r
 ( ( 288 -368 32 0 0 ) ( 288 -368 112 0 1 ) ( 288 -368 192 0 2 ) )\r
@@ -821,7 +821,7 @@ lab610/env1
 {\r
 patchDef2\r
 {\r
-lab610/env1\r
+map_lab-610/env1\r
 ( 3 3 0 0 0 )\r
 (\r
 ( ( 368 -128 192 0 0 ) ( 368 -128 112 0 1 ) ( 368 -128 32 0 2 ) )\r
@@ -834,7 +834,7 @@ lab610/env1
 {\r
 patchDef2\r
 {\r
-lab610/env1\r
+map_lab-610/env1\r
 ( 3 3 0 0 0 )\r
 (\r
 ( ( 288 -368 192 0 0 ) ( 288 -368 112 0 1 ) ( 288 -368 32 0 2 ) )\r
@@ -847,7 +847,7 @@ lab610/env1
 {\r
 patchDef2\r
 {\r
-lab610/env1\r
+map_lab-610/env1\r
 ( 3 3 0 0 0 )\r
 (\r
 ( ( -288 368 32 0 0 ) ( -288 368 112 0 1 ) ( -288 368 192 0 2 ) )\r
@@ -860,7 +860,7 @@ lab610/env1
 {\r
 patchDef2\r
 {\r
-lab610/env1\r
+map_lab-610/env1\r
 ( 3 3 0 0 0 )\r
 (\r
 ( ( -368 128 192 0 0 ) ( -368 128 112 0 1 ) ( -368 128 32 0 2 ) )\r
@@ -873,7 +873,7 @@ lab610/env1
 {\r
 patchDef2\r
 {\r
-lab610/env1\r
+map_lab-610/env1\r
 ( 3 3 0 0 0 )\r
 (\r
 ( ( -288 368 192 0 0 ) ( -288 368 112 0 1 ) ( -288 368 32 0 2 ) )\r
@@ -8460,7 +8460,7 @@ exx/trim-01
 {\r
 patchDef2\r
 {\r
-lab610/env1\r
+map_lab-610/env1\r
 ( 3 3 0 0 0 )\r
 (\r
 ( ( -368 -288 32 0 0 ) ( -368 -288 112 0 1 ) ( -368 -288 192 0 2 ) )\r
@@ -8473,7 +8473,7 @@ lab610/env1
 {\r
 patchDef2\r
 {\r
-lab610/env1\r
+map_lab-610/env1\r
 ( 3 3 0 0 0 )\r
 (\r
 ( ( -128 -368 192 0 0 ) ( -128 -368 112 0 1 ) ( -128 -368 32 0 2 ) )\r
@@ -8486,7 +8486,7 @@ lab610/env1
 {\r
 patchDef2\r
 {\r
-lab610/env1\r
+map_lab-610/env1\r
 ( 3 3 0 0 0 )\r
 (\r
 ( ( -368 -288 192 0 0 ) ( -368 -288 112 0 1 ) ( -368 -288 32 0 2 ) )\r
@@ -35708,7 +35708,7 @@ trak5x/base-pipe1a
 {\r
 patchDef2\r
 {\r
-lab610/warp6\r
+map_lab-610/warp6\r
 ( 3 3 0 0 0 )\r
 (\r
 ( ( -1984 -48 40 0 0 ) ( -1984 -48 104 0 -0.4999999404 ) ( -1984 -48 168 0 -0.9999998808 ) )\r
@@ -35721,7 +35721,7 @@ lab610/warp6
 {\r
 patchDef2\r
 {\r
-lab610/warp1\r
+map_lab-610/warp1\r
 ( 3 3 0 0 0 )\r
 (\r
 ( ( -1984 -48 168 0 0 ) ( -1984 -48 104 0 0.5 ) ( -1984 -48 40 0 1 ) )\r
@@ -35734,7 +35734,7 @@ lab610/warp1
 {\r
 patchDef2\r
 {\r
-lab610/warp5\r
+map_lab-610/warp5\r
 ( 3 3 0 0 0 )\r
 (\r
 ( ( 1984 -48 168 0 0 ) ( 1984 -48 104 0 0.5 ) ( 1984 -48 40 0 1 ) )\r
@@ -35747,7 +35747,7 @@ lab610/warp5
 {\r
 patchDef2\r
 {\r
-lab610/warp2\r
+map_lab-610/warp2\r
 ( 3 3 0 0 0 )\r
 (\r
 ( ( 1984 -48 40 0 0 ) ( 1984 -48 104 0 -0.4999999404 ) ( 1984 -48 168 0 -0.9999998808 ) )\r
@@ -35760,7 +35760,7 @@ lab610/warp2
 {\r
 patchDef2\r
 {\r
-lab610/warp4\r
+map_lab-610/warp4\r
 ( 3 3 0 0 0 )\r
 (\r
 ( ( 768 -1408 40 0 0 ) ( 768 -1408 104 0 -0.4999999404 ) ( 768 -1408 168 0 -0.9999998808 ) )\r
@@ -35773,7 +35773,7 @@ lab610/warp4
 {\r
 patchDef2\r
 {\r
-lab610/warp3\r
+map_lab-610/warp3\r
 ( 3 3 0 0 0 )\r
 (\r
 ( ( -768 -1408 168 0 0 ) ( -768 -1408 104 0 0.5 ) ( -768 -1408 40 0 1 ) )\r
@@ -40794,14 +40794,14 @@ exx/trim-baseboard03
 {\r
 "classname" "target_speaker"\r
 "origin" "-948.000000 -4676.000000 728.000000"\r
-"noise" "sound/lab610/speaker_voice.wav"\r
+"noise" "sound/map_lab-610/speaker_voice.wav"\r
 "atten" "0.5"\r
 }\r
 // entity 325\r
 {\r
 "classname" "target_speaker"\r
 "origin" "-1272.000000 0.000000 168.000000"\r
-"noise" "sound/lab610/speaker_voice.wav"\r
+"noise" "sound/map_lab-610/speaker_voice.wav"\r
 "atten" "1"\r
 }\r
 // entity 326\r

diff --git a/scripts/map_lab-610.shader b/scripts/map_lab-610.shader
index 830f71e3e6548dc0e57e0fb3cafdb8d9b2b22997..5655683a6f8c2a1085ed2b303d0fe2ee2fc359d4 100644 (file)
--- 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