fix variable name, run the preprocessor

diff --git a/scripts/exx.shader b/scripts/exx.shader
index f514d4ed0b86d5aabf01d31feb9f6671f8917f81..78b7163ec8fa272d055f5474bd9d2cf6ccd5a91e 100644 (file)
--- a/scripts/exx.shader
+++ b/scripts/exx.shader
@@ -1,17 +1,12 @@
 textures/exx/base-crete01
 {
        qer_editorimage textures/exx/base/base_crete01.tga
-       
-       q3map_bounceScale  0.5
+       q3map_bounceScale 0.5
        dpoffsetmapping - 2 match8 65
-       dpglossintensitymod  1
-       dpglossexponentmod  1
-
-
+       dpglossintensitymod 1
+       dpglossexponentmod 1
        {
                map textures/exx/base/base_crete01.tga
-               
-
        }
        {
                map $lightmap
@@ -23,17 +18,12 @@ textures/exx/base-crete01
 textures/exx/base-crete01blue
 {
        qer_editorimage textures/exx/base/base_crete01blue.tga
-       
-       q3map_bounceScale  0.5
+       q3map_bounceScale 0.5
        dpoffsetmapping - 2
-       dpglossintensitymod  1
-       dpglossexponentmod  1
-
-
+       dpglossintensitymod 1
+       dpglossexponentmod 1
        {
                map textures/exx/base/base_crete01blue.tga
-               
-
        }
        {
                map $lightmap
@@ -45,17 +35,12 @@ textures/exx/base-crete01blue
 textures/exx/base-crete01red
 {
        qer_editorimage textures/exx/base/base_crete01red.tga
-       
-       q3map_bounceScale  0.5
+       q3map_bounceScale 0.5
        dpoffsetmapping - 2
-       dpglossintensitymod  1
-       dpglossexponentmod  1
-
-
+       dpglossintensitymod 1
+       dpglossexponentmod 1
        {
                map textures/exx/base/base_crete01red.tga
-               
-
        }
        {
                map $lightmap
@@ -67,17 +52,12 @@ textures/exx/base-crete01red
 textures/exx/base-crete02
 {
        qer_editorimage textures/exx/base/base_crete02.tga
-       
-       q3map_bounceScale  0.5
+       q3map_bounceScale 0.5
        dpoffsetmapping - 2 match8 65
-       dpglossintensitymod  1
-       dpglossexponentmod  1
-
-
+       dpglossintensitymod 1
+       dpglossexponentmod 1
        {
                map textures/exx/base/base_crete02.tga
-               
-
        }
        {
                map $lightmap
@@ -89,17 +69,12 @@ textures/exx/base-crete02
 textures/exx/base-crete03
 {
        qer_editorimage textures/exx/base/base_crete03.tga
-       
-       q3map_bounceScale  0.5
+       q3map_bounceScale 0.5
        dpoffsetmapping - 2 match8 65
-       dpglossintensitymod  1
-       dpglossexponentmod  1
-
-
+       dpglossintensitymod 1
+       dpglossexponentmod 1
        {
                map textures/exx/base/base_crete03.tga
-               
-
        }
        {
                map $lightmap
@@ -110,21 +85,35 @@ textures/exx/base-crete03
 }
 textures/exx/base-metal01
 {
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
        qer_editorimage textures/exx/base/base_metal01.tga
-       
        surfaceparm metalsteps
-       q3map_bounceScale  2
+       q3map_bounceScale 2
        dpoffsetmapping - 2 match8 106
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       {
+               map textures/exx/base/base_metal01.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/base-metal01
+{
+       dpshaderkillifcvar cl_cubemaps_extra < 1
+       qer_editorimage textures/exx/base/base_metal01.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 2
+       dpoffsetmapping - 2 match8 106
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
        {
                map textures/exx/base/base_metal01.tga
-               
-
        }
        {
                map $lightmap
@@ -135,21 +124,35 @@ textures/exx/base-metal01
 }
 textures/exx/base-metal02
 {
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/base/base_metal02.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 2
+       dpoffsetmapping - 2 match8 106
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       {
+               map textures/exx/base/base_metal02.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/base-metal02
+{
+       dpshaderkillifcvar cl_cubemaps_extra < 1
        qer_editorimage textures/exx/base/base_metal02.tga
-       
        surfaceparm metalsteps
-       q3map_bounceScale  2
+       q3map_bounceScale 2
        dpoffsetmapping - 2 match8 106
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
        {
                map textures/exx/base/base_metal02.tga
-               
-
        }
        {
                map $lightmap
@@ -160,21 +163,35 @@ textures/exx/base-metal02
 }
 textures/exx/base-metal03
 {
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/base/base_metal03.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 2
+       dpoffsetmapping - 2 match8 106
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       {
+               map textures/exx/base/base_metal03.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/base-metal03
+{
+       dpshaderkillifcvar cl_cubemaps_extra < 1
        qer_editorimage textures/exx/base/base_metal03.tga
-       
        surfaceparm metalsteps
-       q3map_bounceScale  2
+       q3map_bounceScale 2
        dpoffsetmapping - 2 match8 106
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
        {
                map textures/exx/base/base_metal03.tga
-               
-
        }
        {
                map $lightmap
@@ -185,21 +202,35 @@ textures/exx/base-metal03
 }
 textures/exx/base-metal04
 {
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/base/base_metal04.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 2
+       dpoffsetmapping - 2 match8 106
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       {
+               map textures/exx/base/base_metal04.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/base-metal04
+{
+       dpshaderkillifcvar cl_cubemaps_extra < 1
        qer_editorimage textures/exx/base/base_metal04.tga
-       
        surfaceparm metalsteps
-       q3map_bounceScale  2
+       q3map_bounceScale 2
        dpoffsetmapping - 2 match8 106
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
        {
                map textures/exx/base/base_metal04.tga
-               
-
        }
        {
                map $lightmap
@@ -210,21 +241,35 @@ textures/exx/base-metal04
 }
 textures/exx/base-metal05rust
 {
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/base/base_metal05rust.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 2
+       dpoffsetmapping - 2 match8 70
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       {
+               map textures/exx/base/base_metal05rust.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/base-metal05rust
+{
+       dpshaderkillifcvar cl_cubemaps_extra < 1
        qer_editorimage textures/exx/base/base_metal05rust.tga
-       
        surfaceparm metalsteps
-       q3map_bounceScale  2
+       q3map_bounceScale 2
        dpoffsetmapping - 2 match8 70
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
        {
                map textures/exx/base/base_metal05rust.tga
-               
-
        }
        {
                map $lightmap
@@ -235,21 +280,35 @@ textures/exx/base-metal05rust
 }
 textures/exx/base-metal06rust
 {
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/base/base_metal06rust.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 2
+       dpoffsetmapping - 2 match8 70
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       {
+               map textures/exx/base/base_metal06rust.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/base-metal06rust
+{
+       dpshaderkillifcvar cl_cubemaps_extra < 1
        qer_editorimage textures/exx/base/base_metal06rust.tga
-       
        surfaceparm metalsteps
-       q3map_bounceScale  2
+       q3map_bounceScale 2
        dpoffsetmapping - 2 match8 70
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
        {
                map textures/exx/base/base_metal06rust.tga
-               
-
        }
        {
                map $lightmap
@@ -260,21 +319,35 @@ textures/exx/base-metal06rust
 }
 textures/exx/base-metal07rust
 {
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/base/base_metal07rust.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 2
+       dpoffsetmapping - 2 match8 70
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       {
+               map textures/exx/base/base_metal07rust.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/base-metal07rust
+{
+       dpshaderkillifcvar cl_cubemaps_extra < 1
        qer_editorimage textures/exx/base/base_metal07rust.tga
-       
        surfaceparm metalsteps
-       q3map_bounceScale  2
+       q3map_bounceScale 2
        dpoffsetmapping - 2 match8 70
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
        {
                map textures/exx/base/base_metal07rust.tga
-               
-
        }
        {
                map $lightmap
@@ -285,21 +358,35 @@ textures/exx/base-metal07rust
 }
 textures/exx/floor-clang01
 {
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/floor/floor_clang01.tga
+       q3map_bounceScale 0.75
+       dpoffsetmapping - 2 match8 37
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       surfaceparm metalsteps
+       {
+               map textures/exx/floor/floor_clang01.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/floor-clang01
+{
+       dpshaderkillifcvar cl_cubemaps_extra < 1
        qer_editorimage textures/exx/floor/floor_clang01.tga
-       
-       q3map_bounceScale  0.75
+       q3map_bounceScale 0.75
        dpoffsetmapping - 2 match8 37
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        surfaceparm metalsteps
        dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
        {
                map textures/exx/floor/floor_clang01.tga
-               
-
        }
        {
                map $lightmap
@@ -310,21 +397,35 @@ textures/exx/floor-clang01
 }
 textures/exx/floor-clang01b
 {
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/floor/floor_clang01b.tga
+       q3map_bounceScale 0.75
+       dpoffsetmapping - 2 match8 37
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       surfaceparm metalsteps
+       {
+               map textures/exx/floor/floor_clang01b.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/floor-clang01b
+{
+       dpshaderkillifcvar cl_cubemaps_extra < 1
        qer_editorimage textures/exx/floor/floor_clang01b.tga
-       
-       q3map_bounceScale  0.75
+       q3map_bounceScale 0.75
        dpoffsetmapping - 2 match8 37
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        surfaceparm metalsteps
        dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
        {
                map textures/exx/floor/floor_clang01b.tga
-               
-
        }
        {
                map $lightmap
@@ -336,17 +437,12 @@ textures/exx/floor-clang01b
 textures/exx/floor-crete01
 {
        qer_editorimage textures/exx/floor/floor_crete01.tga
-       
-       q3map_bounceScale  0.5
+       q3map_bounceScale 0.5
        dpoffsetmapping - 2 match8 148
-       dpglossintensitymod  1
-       dpglossexponentmod  1
-
-
+       dpglossintensitymod 1
+       dpglossexponentmod 1
        {
                map textures/exx/floor/floor_crete01.tga
-               
-
        }
        {
                map $lightmap
@@ -358,17 +454,12 @@ textures/exx/floor-crete01
 textures/exx/floor-crete01-phoenix
 {
        qer_editorimage textures/exx/floor/floor_crete01_phoenix.tga
-       
-       q3map_bounceScale  0.5
+       q3map_bounceScale 0.5
        dpoffsetmapping - 2 match8 148
-       dpglossintensitymod  1
-       dpglossexponentmod  1
-
-
+       dpglossintensitymod 1
+       dpglossexponentmod 1
        {
                map textures/exx/floor/floor_crete01_phoenix.tga
-               
-
        }
        {
                map $lightmap
@@ -380,17 +471,12 @@ textures/exx/floor-crete01-phoenix
 textures/exx/floor-crete01-phoenixb
 {
        qer_editorimage textures/exx/floor/floor_crete01_phoenixb.tga
-       
-       q3map_bounceScale  0.5
+       q3map_bounceScale 0.5
        dpoffsetmapping - 2 match8 148
-       dpglossintensitymod  1
-       dpglossexponentmod  1
-
-
+       dpglossintensitymod 1
+       dpglossexponentmod 1
        {
                map textures/exx/floor/floor_crete01_phoenixb.tga
-               
-
        }
        {
                map $lightmap
@@ -402,17 +488,12 @@ textures/exx/floor-crete01-phoenixb
 textures/exx/floor-crete01b
 {
        qer_editorimage textures/exx/floor/floor_crete01b.tga
-       
-       q3map_bounceScale  0.5
+       q3map_bounceScale 0.5
        dpoffsetmapping - 2 match8 48
-       dpglossintensitymod  1
-       dpglossexponentmod  1
-
-
+       dpglossintensitymod 1
+       dpglossexponentmod 1
        {
                map textures/exx/floor/floor_crete01b.tga
-               
-
        }
        {
                map $lightmap
@@ -423,23 +504,20 @@ textures/exx/floor-crete01b
 }
 textures/exx/floor-grate01
 {
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
        qer_editorimage textures/exx/floor/floor_grate01.tga
        surfaceparm trans
        surfaceparm metalsteps
-       q3map_bounceScale  0.75
+       q3map_bounceScale 0.75
        surfaceparm alphashadow
        surfaceparm nomarks
        Cull None
        dpoffsetmapping - 2 match8 126
-       dpglossintensitymod  3
-       dpglossexponentmod  4
-       dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        {
                map textures/exx/floor/floor_grate01.tga
-            alphaFunc GT0
+               alphaFunc GT0
        }
        {
                map $lightmap
@@ -448,24 +526,23 @@ textures/exx/floor-grate01
                blendfunc filter
        }
 }
-textures/exx/floor-grate01-cull
+textures/exx/floor-grate01
 {
+       dpshaderkillifcvar cl_cubemaps_extra < 1
        qer_editorimage textures/exx/floor/floor_grate01.tga
        surfaceparm trans
        surfaceparm metalsteps
-       q3map_bounceScale  0.75
+       q3map_bounceScale 0.75
        surfaceparm alphashadow
        surfaceparm nomarks
+       Cull None
        dpoffsetmapping - 2 match8 126
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
        {
                map textures/exx/floor/floor_grate01.tga
-            alphaFunc GT0
+               alphaFunc GT0
        }
        {
                map $lightmap
@@ -474,25 +551,21 @@ textures/exx/floor-grate01-cull
                blendfunc filter
        }
 }
-textures/exx/floor-grate02
+textures/exx/floor-grate01-cull
 {
-       qer_editorimage textures/exx/floor/floor_grate02.tga
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/floor/floor_grate01.tga
        surfaceparm trans
        surfaceparm metalsteps
-       q3map_bounceScale  0.75
+       q3map_bounceScale 0.75
        surfaceparm alphashadow
        surfaceparm nomarks
-       Cull None
-       dpoffsetmapping - 2 match8 224
-       dpglossintensitymod  3
-       dpglossexponentmod  4
-       dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
+       dpoffsetmapping - 2 match8 126
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        {
-               map textures/exx/floor/floor_grate02.tga
-            alphaFunc GT0
+               map textures/exx/floor/floor_grate01.tga
+               alphaFunc GT0
        }
        {
                map $lightmap
@@ -501,24 +574,22 @@ textures/exx/floor-grate02
                blendfunc filter
        }
 }
-textures/exx/floor-grate02-cull
+textures/exx/floor-grate01-cull
 {
-       qer_editorimage textures/exx/floor/floor_grate02.tga
+       dpshaderkillifcvar cl_cubemaps_extra < 1
+       qer_editorimage textures/exx/floor/floor_grate01.tga
        surfaceparm trans
        surfaceparm metalsteps
-       q3map_bounceScale  0.75
+       q3map_bounceScale 0.75
        surfaceparm alphashadow
        surfaceparm nomarks
-       dpoffsetmapping - 2 match8 224
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpoffsetmapping - 2 match8 126
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
        {
-               map textures/exx/floor/floor_grate02.tga
-            alphaFunc GT0
+               map textures/exx/floor/floor_grate01.tga
+               alphaFunc GT0
        }
        {
                map $lightmap
@@ -527,25 +598,22 @@ textures/exx/floor-grate02-cull
                blendfunc filter
        }
 }
-textures/exx/floor-grate03
+textures/exx/floor-grate02
 {
-       qer_editorimage textures/exx/floor/floor_grate03.tga
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/floor/floor_grate02.tga
        surfaceparm trans
        surfaceparm metalsteps
-       q3map_bounceScale  0.75
+       q3map_bounceScale 0.75
        surfaceparm alphashadow
        surfaceparm nomarks
        Cull None
-       dpoffsetmapping - 2 match8 223
-       dpglossintensitymod  3
-       dpglossexponentmod  4
-       dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
+       dpoffsetmapping - 2 match8 224
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        {
-               map textures/exx/floor/floor_grate03.tga
-            alphaFunc GT0
+               map textures/exx/floor/floor_grate02.tga
+               alphaFunc GT0
        }
        {
                map $lightmap
@@ -554,24 +622,23 @@ textures/exx/floor-grate03
                blendfunc filter
        }
 }
-textures/exx/floor-grate03-cull
+textures/exx/floor-grate02
 {
-       qer_editorimage textures/exx/floor/floor_grate03.tga
+       dpshaderkillifcvar cl_cubemaps_extra < 1
+       qer_editorimage textures/exx/floor/floor_grate02.tga
        surfaceparm trans
        surfaceparm metalsteps
-       q3map_bounceScale  0.75
+       q3map_bounceScale 0.75
        surfaceparm alphashadow
        surfaceparm nomarks
-       dpoffsetmapping - 2 match8 223
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       Cull None
+       dpoffsetmapping - 2 match8 224
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
        {
-               map textures/exx/floor/floor_grate03.tga
-            alphaFunc GT0
+               map textures/exx/floor/floor_grate02.tga
+               alphaFunc GT0
        }
        {
                map $lightmap
@@ -580,25 +647,21 @@ textures/exx/floor-grate03-cull
                blendfunc filter
        }
 }
-textures/exx/floor-grate04
+textures/exx/floor-grate02-cull
 {
-       qer_editorimage textures/exx/floor/floor_grate04.tga
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/floor/floor_grate02.tga
        surfaceparm trans
        surfaceparm metalsteps
-       q3map_bounceScale  0.75
+       q3map_bounceScale 0.75
        surfaceparm alphashadow
        surfaceparm nomarks
-       Cull None
-       dpoffsetmapping - 2 match8 248
-       dpglossintensitymod  3
-       dpglossexponentmod  4
-       dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
+       dpoffsetmapping - 2 match8 224
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        {
-               map textures/exx/floor/floor_grate04.tga
-            alphaFunc GT0
+               map textures/exx/floor/floor_grate02.tga
+               alphaFunc GT0
        }
        {
                map $lightmap
@@ -607,25 +670,22 @@ textures/exx/floor-grate04
                blendfunc filter
        }
 }
-
-textures/exx/floor-grate04-cull
+textures/exx/floor-grate02-cull
 {
-       qer_editorimage textures/exx/floor/floor_grate04.tga
+       dpshaderkillifcvar cl_cubemaps_extra < 1
+       qer_editorimage textures/exx/floor/floor_grate02.tga
        surfaceparm trans
        surfaceparm metalsteps
-       q3map_bounceScale  0.75
+       q3map_bounceScale 0.75
        surfaceparm alphashadow
        surfaceparm nomarks
-       dpoffsetmapping - 2 match8 248
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpoffsetmapping - 2 match8 224
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
        {
-               map textures/exx/floor/floor_grate04.tga
-            alphaFunc GT0
+               map textures/exx/floor/floor_grate02.tga
+               alphaFunc GT0
        }
        {
                map $lightmap
@@ -634,25 +694,22 @@ textures/exx/floor-grate04-cull
                blendfunc filter
        }
 }
-
-
-textures/exx/floor-metal02
+textures/exx/floor-grate03
 {
-       qer_editorimage textures/exx/floor/floor_metal02.tga
-       
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/floor/floor_grate03.tga
+       surfaceparm trans
        surfaceparm metalsteps
-       q3map_bounceScale  2
-       dpoffsetmapping - 2 match8 241
-       dpglossintensitymod  3
-       dpglossexponentmod  4
-       dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
+       q3map_bounceScale 0.75
+       surfaceparm alphashadow
+       surfaceparm nomarks
+       Cull None
+       dpoffsetmapping - 2 match8 223
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        {
-               map textures/exx/floor/floor_metal02.tga
-               
-
+               map textures/exx/floor/floor_grate03.tga
+               alphaFunc GT0
        }
        {
                map $lightmap
@@ -661,22 +718,23 @@ textures/exx/floor-metal02
                blendfunc filter
        }
 }
-textures/exx/floor-panel01
+textures/exx/floor-grate03
 {
-       qer_editorimage textures/exx/floor/floor_panel01.tga
+       dpshaderkillifcvar cl_cubemaps_extra < 1
+       qer_editorimage textures/exx/floor/floor_grate03.tga
+       surfaceparm trans
        surfaceparm metalsteps
-       q3map_bounceScale  0.75
-       dpoffsetmapping - 2 match8 172
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       q3map_bounceScale 0.75
+       surfaceparm alphashadow
+       surfaceparm nomarks
+       Cull None
+       dpoffsetmapping - 2 match8 223
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
        {
-               map textures/exx/floor/floor_panel01.tga
-               
-
+               map textures/exx/floor/floor_grate03.tga
+               alphaFunc GT0
        }
        {
                map $lightmap
@@ -685,23 +743,21 @@ textures/exx/floor-panel01
                blendfunc filter
        }
 }
-textures/exx/floor-rnd01
+textures/exx/floor-grate03-cull
 {
-       qer_editorimage textures/exx/floor/floor_rnd01.tga
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/floor/floor_grate03.tga
+       surfaceparm trans
        surfaceparm metalsteps
-       
-       q3map_bounceScale  0.75
-       dpoffsetmapping - 2 match8 128
-       dpglossintensitymod  3
-       dpglossexponentmod  4
-       dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
+       q3map_bounceScale 0.75
+       surfaceparm alphashadow
+       surfaceparm nomarks
+       dpoffsetmapping - 2 match8 223
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        {
-               map textures/exx/floor/floor_rnd01.tga
-               
-
+               map textures/exx/floor/floor_grate03.tga
+               alphaFunc GT0
        }
        {
                map $lightmap
@@ -710,23 +766,22 @@ textures/exx/floor-rnd01
                blendfunc filter
        }
 }
-textures/exx/floor-rnd02
+textures/exx/floor-grate03-cull
 {
-       qer_editorimage textures/exx/floor/floor_rnd02.tga
+       dpshaderkillifcvar cl_cubemaps_extra < 1
+       qer_editorimage textures/exx/floor/floor_grate03.tga
+       surfaceparm trans
        surfaceparm metalsteps
-       
-       q3map_bounceScale  0.75
-       dpoffsetmapping - 2 match8 110
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       q3map_bounceScale 0.75
+       surfaceparm alphashadow
+       surfaceparm nomarks
+       dpoffsetmapping - 2 match8 223
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
        {
-               map textures/exx/floor/floor_rnd02.tga
-               
-
+               map textures/exx/floor/floor_grate03.tga
+               alphaFunc GT0
        }
        {
                map $lightmap
@@ -735,23 +790,289 @@ textures/exx/floor-rnd02
                blendfunc filter
        }
 }
-textures/exx/floor-simple05
+textures/exx/floor-grate04
 {
-       qer_editorimage textures/exx/floor/floor_simple05.tga
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/floor/floor_grate04.tga
+       surfaceparm trans
+       surfaceparm metalsteps
+       q3map_bounceScale 0.75
+       surfaceparm alphashadow
+       surfaceparm nomarks
+       Cull None
+       dpoffsetmapping - 2 match8 248
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       {
+               map textures/exx/floor/floor_grate04.tga
+               alphaFunc GT0
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/floor-grate04
+{
+       dpshaderkillifcvar cl_cubemaps_extra < 1
+       qer_editorimage textures/exx/floor/floor_grate04.tga
+       surfaceparm trans
+       surfaceparm metalsteps
+       q3map_bounceScale 0.75
+       surfaceparm alphashadow
+       surfaceparm nomarks
+       Cull None
+       dpoffsetmapping - 2 match8 248
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       dpreflectcube env/exomorph/exomorph
+       {
+               map textures/exx/floor/floor_grate04.tga
+               alphaFunc GT0
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/floor-grate04-cull
+{
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/floor/floor_grate04.tga
+       surfaceparm trans
+       surfaceparm metalsteps
+       q3map_bounceScale 0.75
+       surfaceparm alphashadow
+       surfaceparm nomarks
+       dpoffsetmapping - 2 match8 248
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       {
+               map textures/exx/floor/floor_grate04.tga
+               alphaFunc GT0
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/floor-grate04-cull
+{
+       dpshaderkillifcvar cl_cubemaps_extra < 1
+       qer_editorimage textures/exx/floor/floor_grate04.tga
+       surfaceparm trans
+       surfaceparm metalsteps
+       q3map_bounceScale 0.75
+       surfaceparm alphashadow
+       surfaceparm nomarks
+       dpoffsetmapping - 2 match8 248
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       dpreflectcube env/exomorph/exomorph
+       {
+               map textures/exx/floor/floor_grate04.tga
+               alphaFunc GT0
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/floor-metal02
+{
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/floor/floor_metal02.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 2
+       dpoffsetmapping - 2 match8 241
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       {
+               map textures/exx/floor/floor_metal02.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/floor-metal02
+{
+       dpshaderkillifcvar cl_cubemaps_extra < 1
+       qer_editorimage textures/exx/floor/floor_metal02.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 2
+       dpoffsetmapping - 2 match8 241
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       dpreflectcube env/exomorph/exomorph
+       {
+               map textures/exx/floor/floor_metal02.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/floor-panel01
+{
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/floor/floor_panel01.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 0.75
+       dpoffsetmapping - 2 match8 172
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       {
+               map textures/exx/floor/floor_panel01.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/floor-panel01
+{
+       dpshaderkillifcvar cl_cubemaps_extra < 1
+       qer_editorimage textures/exx/floor/floor_panel01.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 0.75
+       dpoffsetmapping - 2 match8 172
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       dpreflectcube env/exomorph/exomorph
+       {
+               map textures/exx/floor/floor_panel01.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/floor-rnd01
+{
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/floor/floor_rnd01.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 0.75
+       dpoffsetmapping - 2 match8 128
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       {
+               map textures/exx/floor/floor_rnd01.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/floor-rnd01
+{
+       dpshaderkillifcvar cl_cubemaps_extra < 1
+       qer_editorimage textures/exx/floor/floor_rnd01.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 0.75
+       dpoffsetmapping - 2 match8 128
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       dpreflectcube env/exomorph/exomorph
+       {
+               map textures/exx/floor/floor_rnd01.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/floor-rnd02
+{
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/floor/floor_rnd02.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 0.75
+       dpoffsetmapping - 2 match8 110
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       {
+               map textures/exx/floor/floor_rnd02.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/floor-rnd02
+{
+       dpshaderkillifcvar cl_cubemaps_extra < 1
+       qer_editorimage textures/exx/floor/floor_rnd02.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 0.75
+       dpoffsetmapping - 2 match8 110
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       dpreflectcube env/exomorph/exomorph
+       {
+               map textures/exx/floor/floor_rnd02.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/floor-simple05
+{
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/floor/floor_simple05.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 0.75
+       dpoffsetmapping - 4 match8 32
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       {
+               map textures/exx/floor/floor_simple05.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/floor-simple05
+{
+       dpshaderkillifcvar cl_cubemaps_extra < 1
+       qer_editorimage textures/exx/floor/floor_simple05.tga
        surfaceparm metalsteps
-       
-       q3map_bounceScale  0.75
+       q3map_bounceScale 0.75
        dpoffsetmapping - 4 match8 32
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
        {
                map textures/exx/floor/floor_simple05.tga
-               
-
        }
        {
                map $lightmap
@@ -762,20 +1083,33 @@ textures/exx/floor-simple05
 }
 textures/exx/floor-simplines
 {
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/floor/floor_simplines.tga
+       q3map_bounceScale 0.75
+       dpoffsetmapping - 1 match8 244
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       {
+               map textures/exx/floor/floor_simplines.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/floor-simplines
+{
+       dpshaderkillifcvar cl_cubemaps_extra < 1
        qer_editorimage textures/exx/floor/floor_simplines.tga
-       
-       q3map_bounceScale  0.75
+       q3map_bounceScale 0.75
        dpoffsetmapping - 1 match8 244
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
        {
                map textures/exx/floor/floor_simplines.tga
-               
-
        }
        {
                map $lightmap
@@ -786,21 +1120,35 @@ textures/exx/floor-simplines
 }
 textures/exx/floor-tile03
 {
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/floor/floor_tile03.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 0.75
+       dpoffsetmapping - 2 match8 218
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       {
+               map textures/exx/floor/floor_tile03.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/floor-tile03
+{
+       dpshaderkillifcvar cl_cubemaps_extra < 1
        qer_editorimage textures/exx/floor/floor_tile03.tga
        surfaceparm metalsteps
-       
-       q3map_bounceScale  0.75
+       q3map_bounceScale 0.75
        dpoffsetmapping - 2 match8 218
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
        {
                map textures/exx/floor/floor_tile03.tga
-               
-
        }
        {
                map $lightmap
@@ -811,21 +1159,15 @@ textures/exx/floor-tile03
 }
 textures/exx/floor-tread01
 {
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
        qer_editorimage textures/exx/floor/floor_tread01.tga
        surfaceparm metalsteps
-       
-       q3map_bounceScale  0.75
+       q3map_bounceScale 0.75
        dpoffsetmapping - 1 match8 221
-       dpglossintensitymod  3
-       dpglossexponentmod  4
-       dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        {
                map textures/exx/floor/floor_tread01.tga
-               
-
        }
        {
                map $lightmap
@@ -834,20 +1176,740 @@ textures/exx/floor-tread01
                blendfunc filter
        }
 }
-textures/exx/floor-wrn01
+textures/exx/floor-tread01
 {
-       qer_editorimage textures/exx/floor/floor_wrn01.tga
-       
-       q3map_bounceScale  0.75
-       dpoffsetmapping - 2 match8 46
-       dpglossintensitymod  3
-       dpglossexponentmod  4
-
-
-       {
-               map textures/exx/floor/floor_wrn01.tga
-               
-
+       dpshaderkillifcvar cl_cubemaps_extra < 1
+       qer_editorimage textures/exx/floor/floor_tread01.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 0.75
+       dpoffsetmapping - 1 match8 221
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       dpreflectcube env/exomorph/exomorph
+       {
+               map textures/exx/floor/floor_tread01.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/floor-wrn01
+{
+       qer_editorimage textures/exx/floor/floor_wrn01.tga
+       q3map_bounceScale 0.75
+       dpoffsetmapping - 2 match8 46
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       {
+               map textures/exx/floor/floor_wrn01.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/floor-wrn01-blue
+{
+       qer_editorimage textures/exx/floor/floor_wrn01-blue.tga
+       q3map_bounceScale 0.75
+       dpoffsetmapping - 2 match8 46
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       {
+               map textures/exx/floor/floor_wrn01-blue.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/floor-wrn01-red
+{
+       qer_editorimage textures/exx/floor/floor_wrn01-red.tga
+       q3map_bounceScale 0.75
+       dpoffsetmapping - 2 match8 46
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       {
+               map textures/exx/floor/floor_wrn01-red.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/floor-wrn01-purple
+{
+       qer_editorimage textures/exx/floor/floor_wrn01-purple.tga
+       q3map_bounceScale 0.75
+       dpoffsetmapping - 2 match8 46
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       {
+               map textures/exx/floor/floor_wrn01-purple.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/light-panel01
+{
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/light/light_panel01.tga
+       q3map_bounceScale 0.75
+       dpoffsetmapping - 2 match8 79
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       {
+               map textures/exx/light/light_panel01.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/light-panel01
+{
+       dpshaderkillifcvar cl_cubemaps_extra < 1
+       qer_editorimage textures/exx/light/light_panel01.tga
+       q3map_bounceScale 0.75
+       dpoffsetmapping - 2 match8 79
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       dpreflectcube env/exomorph/exomorph
+       {
+               map textures/exx/light/light_panel01.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/light-panel01-surfacelight
+{
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/light/light_panel01.tga
+       q3map_bounceScale 0.75
+       dpoffsetmapping - 2 match8 79
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       q3map_surfacelight 2500
+       q3map_lightSubdivide 64
+       {
+               map textures/exx/light/light_panel01.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/light-panel01-surfacelight
+{
+       dpshaderkillifcvar cl_cubemaps_extra < 1
+       qer_editorimage textures/exx/light/light_panel01.tga
+       q3map_bounceScale 0.75
+       dpoffsetmapping - 2 match8 79
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       q3map_surfacelight 2500
+       q3map_lightSubdivide 64
+       dpreflectcube env/exomorph/exomorph
+       {
+               map textures/exx/light/light_panel01.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/light-u201
+{
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/light/light_u201.tga
+       q3map_bounceScale 0.75
+       dpoffsetmapping - 2 match8 76
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       {
+               map textures/exx/light/light_u201.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/light-u201
+{
+       dpshaderkillifcvar cl_cubemaps_extra < 1
+       qer_editorimage textures/exx/light/light_u201.tga
+       q3map_bounceScale 0.75
+       dpoffsetmapping - 2 match8 76
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       dpreflectcube env/exomorph/exomorph
+       {
+               map textures/exx/light/light_u201.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/light-u201-surfacelight
+{
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/light/light_u201.tga
+       q3map_bounceScale 0.75
+       dpoffsetmapping - 2 match8 76
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       q3map_surfacelight 2500
+       q3map_lightSubdivide 64
+       {
+               map textures/exx/light/light_u201.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/light-u201-surfacelight
+{
+       dpshaderkillifcvar cl_cubemaps_extra < 1
+       qer_editorimage textures/exx/light/light_u201.tga
+       q3map_bounceScale 0.75
+       dpoffsetmapping - 2 match8 76
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       q3map_surfacelight 2500
+       q3map_lightSubdivide 64
+       dpreflectcube env/exomorph/exomorph
+       {
+               map textures/exx/light/light_u201.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/panel-grate01
+{
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/panel/panel_grate01.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 2
+       dpoffsetmapping - 2
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       surfaceparm nomarks
+       surfaceparm trans
+       surfaceparm alphashadow
+       cull none
+       nopicmip 
+       nomipmaps 
+       {
+               map textures/exx/panel/panel_grate01.tga
+               alphaFunc GT0
+               rgbgen vertex
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/panel-grate01
+{
+       dpshaderkillifcvar cl_cubemaps_extra < 1
+       qer_editorimage textures/exx/panel/panel_grate01.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 2
+       dpoffsetmapping - 2
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       surfaceparm nomarks
+       surfaceparm trans
+       surfaceparm alphashadow
+       cull none
+       nopicmip 
+       nomipmaps 
+       dpreflectcube env/exomorph/exomorph
+       {
+               map textures/exx/panel/panel_grate01.tga
+               alphaFunc GT0
+               rgbgen vertex
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/panel-grate01-cull
+{
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/panel/panel_grate01.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 2
+       dpoffsetmapping - 2
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       surfaceparm nomarks
+       surfaceparm trans
+       surfaceparm alphashadow
+       nopicmip 
+       nomipmaps 
+       {
+               map textures/exx/panel/panel_grate01.tga
+               alphaFunc GT0
+               rgbgen vertex
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/panel-grate01-cull
+{
+       dpshaderkillifcvar cl_cubemaps_extra < 1
+       qer_editorimage textures/exx/panel/panel_grate01.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 2
+       dpoffsetmapping - 2
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       surfaceparm nomarks
+       surfaceparm trans
+       surfaceparm alphashadow
+       nopicmip 
+       nomipmaps 
+       dpreflectcube env/exomorph/exomorph
+       {
+               map textures/exx/panel/panel_grate01.tga
+               alphaFunc GT0
+               rgbgen vertex
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/panel-metal01
+{
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/panel/panel_metal01.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 2
+       dpoffsetmapping - 2 match8 101
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       {
+               map textures/exx/panel/panel_metal01.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/panel-metal01
+{
+       dpshaderkillifcvar cl_cubemaps_extra < 1
+       qer_editorimage textures/exx/panel/panel_metal01.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 2
+       dpoffsetmapping - 2 match8 101
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       dpreflectcube env/exomorph/exomorph
+       {
+               map textures/exx/panel/panel_metal01.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/panel-metal01b
+{
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/panel/panel_metal01b.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 2
+       dpoffsetmapping - 2 match8 101
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       {
+               map textures/exx/panel/panel_metal01b.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/panel-metal01b
+{
+       dpshaderkillifcvar cl_cubemaps_extra < 1
+       qer_editorimage textures/exx/panel/panel_metal01b.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 2
+       dpoffsetmapping - 2 match8 101
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       dpreflectcube env/exomorph/exomorph
+       {
+               map textures/exx/panel/panel_metal01b.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/panel-metal01c
+{
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/panel/panel_metal01c.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 2
+       dpoffsetmapping - 2 match8 116
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       {
+               map textures/exx/panel/panel_metal01c.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/panel-metal01c
+{
+       dpshaderkillifcvar cl_cubemaps_extra < 1
+       qer_editorimage textures/exx/panel/panel_metal01c.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 2
+       dpoffsetmapping - 2 match8 116
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       dpreflectcube env/exomorph/exomorph
+       {
+               map textures/exx/panel/panel_metal01c.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/panel-metal02
+{
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/panel/panel_metal02.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 2
+       dpoffsetmapping - 2 match8 216
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       {
+               map textures/exx/panel/panel_metal02.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/panel-metal02
+{
+       dpshaderkillifcvar cl_cubemaps_extra < 1
+       qer_editorimage textures/exx/panel/panel_metal02.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 2
+       dpoffsetmapping - 2 match8 216
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       dpreflectcube env/exomorph/exomorph
+       {
+               map textures/exx/panel/panel_metal02.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/panel-metal03
+{
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/panel/panel_metal03.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 2
+       dpoffsetmapping - 2 match8 241
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       {
+               map textures/exx/panel/panel_metal03.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/panel-metal03
+{
+       dpshaderkillifcvar cl_cubemaps_extra < 1
+       qer_editorimage textures/exx/panel/panel_metal03.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 2
+       dpoffsetmapping - 2 match8 241
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       dpreflectcube env/exomorph/exomorph
+       {
+               map textures/exx/panel/panel_metal03.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/panel-metal04
+{
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/panel/panel_metal04.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 2
+       dpoffsetmapping - 2 match8 229
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       {
+               map textures/exx/panel/panel_metal04.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/panel-metal04
+{
+       dpshaderkillifcvar cl_cubemaps_extra < 1
+       qer_editorimage textures/exx/panel/panel_metal04.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 2
+       dpoffsetmapping - 2 match8 229
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       dpreflectcube env/exomorph/exomorph
+       {
+               map textures/exx/panel/panel_metal04.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/panel-metal05
+{
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/panel/panel_metal05.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 2
+       dpoffsetmapping - 2 match8 238
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       {
+               map textures/exx/panel/panel_metal05.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/panel-metal05
+{
+       dpshaderkillifcvar cl_cubemaps_extra < 1
+       qer_editorimage textures/exx/panel/panel_metal05.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 2
+       dpoffsetmapping - 2 match8 238
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       dpreflectcube env/exomorph/exomorph
+       {
+               map textures/exx/panel/panel_metal05.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/panel-metalbig04
+{
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/panel/panel_metalbig04.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 2
+       dpoffsetmapping - 2 match8 165
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       {
+               map textures/exx/panel/panel_metalbig04.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/panel-metalbig04
+{
+       dpshaderkillifcvar cl_cubemaps_extra < 1
+       qer_editorimage textures/exx/panel/panel_metalbig04.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 2
+       dpoffsetmapping - 2 match8 165
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       dpreflectcube env/exomorph/exomorph
+       {
+               map textures/exx/panel/panel_metalbig04.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/panel-metalbig04b
+{
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/panel/panel_metalbig04b.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 2
+       dpoffsetmapping - 2 match8 177
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       {
+               map textures/exx/panel/panel_metalbig04b.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/panel-metalbig04b
+{
+       dpshaderkillifcvar cl_cubemaps_extra < 1
+       qer_editorimage textures/exx/panel/panel_metalbig04b.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 2
+       dpoffsetmapping - 2 match8 177
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       dpreflectcube env/exomorph/exomorph
+       {
+               map textures/exx/panel/panel_metalbig04b.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/panel-q201
+{
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/panel/panel_q201.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 0.75
+       dpoffsetmapping - 2 match8 138
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       {
+               map textures/exx/panel/panel_q201.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/panel-q201
+{
+       dpshaderkillifcvar cl_cubemaps_extra < 1
+       qer_editorimage textures/exx/panel/panel_q201.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 0.75
+       dpoffsetmapping - 2 match8 138
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       dpreflectcube env/exomorph/exomorph
+       {
+               map textures/exx/panel/panel_q201.tga
        }
        {
                map $lightmap
@@ -856,21 +1918,17 @@ textures/exx/floor-wrn01
                blendfunc filter
        }
 }
-
-textures/exx/floor-wrn01-blue
+textures/exx/panel-q201b
 {
-       qer_editorimage textures/exx/floor/floor_wrn01-blue.tga
-       
-       q3map_bounceScale  0.75
-       dpoffsetmapping - 2 match8 46
-       dpglossintensitymod  3
-       dpglossexponentmod  4
-
-
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/panel/panel_q201b.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 0.75
+       dpoffsetmapping - 2 match8 81
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        {
-               map textures/exx/floor/floor_wrn01-blue.tga
-               
-
+               map textures/exx/panel/panel_q201b.tga
        }
        {
                map $lightmap
@@ -879,21 +1937,18 @@ textures/exx/floor-wrn01-blue
                blendfunc filter
        }
 }
-
-textures/exx/floor-wrn01-red
+textures/exx/panel-q201b
 {
-       qer_editorimage textures/exx/floor/floor_wrn01-red.tga
-       
-       q3map_bounceScale  0.75
-       dpoffsetmapping - 2 match8 46
-       dpglossintensitymod  3
-       dpglossexponentmod  4
-
-
+       dpshaderkillifcvar cl_cubemaps_extra < 1
+       qer_editorimage textures/exx/panel/panel_q201b.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 0.75
+       dpoffsetmapping - 2 match8 81
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       dpreflectcube env/exomorph/exomorph
        {
-               map textures/exx/floor/floor_wrn01-red.tga
-               
-
+               map textures/exx/panel/panel_q201b.tga
        }
        {
                map $lightmap
@@ -902,21 +1957,17 @@ textures/exx/floor-wrn01-red
                blendfunc filter
        }
 }
-
-textures/exx/floor-wrn01-purple
+textures/exx/panel-q201c
 {
-       qer_editorimage textures/exx/floor/floor_wrn01-purple.tga
-       
-       q3map_bounceScale  0.75
-       dpoffsetmapping - 2 match8 46
-       dpglossintensitymod  3
-       dpglossexponentmod  4
-
-
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/panel/panel_q201c.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 0.75
+       dpoffsetmapping - 2 match8 98
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        {
-               map textures/exx/floor/floor_wrn01-purple.tga
-               
-
+               map textures/exx/panel/panel_q201c.tga
        }
        {
                map $lightmap
@@ -925,23 +1976,18 @@ textures/exx/floor-wrn01-purple
                blendfunc filter
        }
 }
-
-textures/exx/light-panel01
+textures/exx/panel-q201c
 {
-       qer_editorimage textures/exx/light/light_panel01.tga
-       
-       q3map_bounceScale  0.75
-       dpoffsetmapping - 2 match8 79
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpshaderkillifcvar cl_cubemaps_extra < 1
+       qer_editorimage textures/exx/panel/panel_q201c.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 0.75
+       dpoffsetmapping - 2 match8 98
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
        {
-               map textures/exx/light/light_panel01.tga
-               
-
+               map textures/exx/panel/panel_q201c.tga
        }
        {
                map $lightmap
@@ -950,26 +1996,17 @@ textures/exx/light-panel01
                blendfunc filter
        }
 }
-textures/exx/light-panel01-surfacelight
+textures/exx/panel-q201d
 {
-       qer_editorimage textures/exx/light/light_panel01.tga
-       
-       q3map_bounceScale  0.75
-       dpoffsetmapping - 2 match8 79
-       dpglossintensitymod  3
-       dpglossexponentmod  4
-
-       q3map_surfacelight 2500
-       q3map_lightSubdivide 64
-
-       dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/panel/panel_q201d.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 0.75
+       dpoffsetmapping - 2 match8 189
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        {
-               map textures/exx/light/light_panel01.tga
-               
-
+               map textures/exx/panel/panel_q201d.tga
        }
        {
                map $lightmap
@@ -978,23 +2015,18 @@ textures/exx/light-panel01-surfacelight
                blendfunc filter
        }
 }
-textures/exx/light-u201
+textures/exx/panel-q201d
 {
-       qer_editorimage textures/exx/light/light_u201.tga
-       
-       q3map_bounceScale  0.75
-       dpoffsetmapping - 2 match8 76
-       dpglossintensitymod  3
-       dpglossexponentmod  4
-
+       dpshaderkillifcvar cl_cubemaps_extra < 1
+       qer_editorimage textures/exx/panel/panel_q201d.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 0.75
+       dpoffsetmapping - 2 match8 189
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
        {
-               map textures/exx/light/light_u201.tga
-               
-
+               map textures/exx/panel/panel_q201d.tga
        }
        {
                map $lightmap
@@ -1003,26 +2035,17 @@ textures/exx/light-u201
                blendfunc filter
        }
 }
-textures/exx/light-u201-surfacelight
+textures/exx/panel-q201e
 {
-       qer_editorimage textures/exx/light/light_u201.tga
-       
-       q3map_bounceScale  0.75
-       dpoffsetmapping - 2 match8 76
-       dpglossintensitymod  3
-       dpglossexponentmod  4
-
-       q3map_surfacelight 2500
-       q3map_lightSubdivide 64
-
-       dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/panel/panel_q201e.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 0.75
+       dpoffsetmapping - 2 match8 132
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        {
-               map textures/exx/light/light_u201.tga
-               
-
+               map textures/exx/panel/panel_q201e.tga
        }
        {
                map $lightmap
@@ -1031,32 +2054,18 @@ textures/exx/light-u201-surfacelight
                blendfunc filter
        }
 }
-textures/exx/panel-grate01
+textures/exx/panel-q201e
 {
-       qer_editorimage textures/exx/panel/panel_grate01.tga
-       
+       dpshaderkillifcvar cl_cubemaps_extra < 1
+       qer_editorimage textures/exx/panel/panel_q201e.tga
        surfaceparm metalsteps
-       q3map_bounceScale  2
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
-       dpglossexponentmod  4
-
-       surfaceparm nomarks
-       surfaceparm trans
-       surfaceparm alphashadow
-
-       cull none
-       nopicmip
-       nomipmaps
-
+       q3map_bounceScale 0.75
+       dpoffsetmapping - 2 match8 132
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
        {
-               map textures/exx/panel/panel_grate01.tga
-               alphaFunc GT0
-               rgbgen vertex
+               map textures/exx/panel/panel_q201e.tga
        }
        {
                map $lightmap
@@ -1065,31 +2074,17 @@ textures/exx/panel-grate01
                blendfunc filter
        }
 }
-textures/exx/panel-grate01-cull
+textures/exx/panel-rs01
 {
-       qer_editorimage textures/exx/panel/panel_grate01.tga
-       
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/panel/panel_rs01.tga
        surfaceparm metalsteps
-       q3map_bounceScale  2
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
-       dpglossexponentmod  4
-
-       surfaceparm nomarks
-       surfaceparm trans
-       surfaceparm alphashadow
-
-       nopicmip
-       nomipmaps
-
-       dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
+       q3map_bounceScale 0.75
+       dpoffsetmapping - 2 match8 178
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        {
-               map textures/exx/panel/panel_grate01.tga
-               alphaFunc GT0
-               rgbgen vertex
+               map textures/exx/panel/panel_rs01.tga
        }
        {
                map $lightmap
@@ -1098,23 +2093,18 @@ textures/exx/panel-grate01-cull
                blendfunc filter
        }
 }
-textures/exx/panel-metal01
+textures/exx/panel-rs01
 {
-       qer_editorimage textures/exx/panel/panel_metal01.tga
-       
+       dpshaderkillifcvar cl_cubemaps_extra < 1
+       qer_editorimage textures/exx/panel/panel_rs01.tga
        surfaceparm metalsteps
-       q3map_bounceScale  2
-       dpoffsetmapping - 2 match8 101
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       q3map_bounceScale 0.75
+       dpoffsetmapping - 2 match8 178
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
        {
-               map textures/exx/panel/panel_metal01.tga
-               
-
+               map textures/exx/panel/panel_rs01.tga
        }
        {
                map $lightmap
@@ -1123,23 +2113,17 @@ textures/exx/panel-metal01
                blendfunc filter
        }
 }
-textures/exx/panel-metal01b
+textures/exx/trim-01
 {
-       qer_editorimage textures/exx/panel/panel_metal01b.tga
-       
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/trim/trim_01.tga
        surfaceparm metalsteps
-       q3map_bounceScale  2
-       dpoffsetmapping - 2 match8 101
-       dpglossintensitymod  3
-       dpglossexponentmod  4
-       dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
+       q3map_bounceScale 1.5
+       dpoffsetmapping - 2 match8 169
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        {
-               map textures/exx/panel/panel_metal01b.tga
-               
-
+               map textures/exx/trim/trim_01.tga
        }
        {
                map $lightmap
@@ -1148,23 +2132,18 @@ textures/exx/panel-metal01b
                blendfunc filter
        }
 }
-textures/exx/panel-metal01c
+textures/exx/trim-01
 {
-       qer_editorimage textures/exx/panel/panel_metal01c.tga
-       
+       dpshaderkillifcvar cl_cubemaps_extra < 1
+       qer_editorimage textures/exx/trim/trim_01.tga
        surfaceparm metalsteps
-       q3map_bounceScale  2
-       dpoffsetmapping - 2 match8 116
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       q3map_bounceScale 1.5
+       dpoffsetmapping - 2 match8 169
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
        {
-               map textures/exx/panel/panel_metal01c.tga
-               
-
+               map textures/exx/trim/trim_01.tga
        }
        {
                map $lightmap
@@ -1173,23 +2152,17 @@ textures/exx/panel-metal01c
                blendfunc filter
        }
 }
-textures/exx/panel-metal02
+textures/exx/trim-baseboard
 {
-       qer_editorimage textures/exx/panel/panel_metal02.tga
-       
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/trim/trim_baseboard.tga
        surfaceparm metalsteps
-       q3map_bounceScale  2
-       dpoffsetmapping - 2 match8 216
-       dpglossintensitymod  3
-       dpglossexponentmod  4
-       dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
+       q3map_bounceScale 1.5
+       dpoffsetmapping - 2 match8 181
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        {
-               map textures/exx/panel/panel_metal02.tga
-               
-
+               map textures/exx/trim/trim_baseboard.tga
        }
        {
                map $lightmap
@@ -1198,23 +2171,18 @@ textures/exx/panel-metal02
                blendfunc filter
        }
 }
-textures/exx/panel-metal03
+textures/exx/trim-baseboard
 {
-       qer_editorimage textures/exx/panel/panel_metal03.tga
-       
+       dpshaderkillifcvar cl_cubemaps_extra < 1
+       qer_editorimage textures/exx/trim/trim_baseboard.tga
        surfaceparm metalsteps
-       q3map_bounceScale  2
-       dpoffsetmapping - 2 match8 241
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       q3map_bounceScale 1.5
+       dpoffsetmapping - 2 match8 181
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
        {
-               map textures/exx/panel/panel_metal03.tga
-               
-
+               map textures/exx/trim/trim_baseboard.tga
        }
        {
                map $lightmap
@@ -1223,23 +2191,17 @@ textures/exx/panel-metal03
                blendfunc filter
        }
 }
-textures/exx/panel-metal04
+textures/exx/trim-baseboard02
 {
-       qer_editorimage textures/exx/panel/panel_metal04.tga
-       
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/trim/trim_baseboard02.tga
        surfaceparm metalsteps
-       q3map_bounceScale  2
-       dpoffsetmapping - 2 match8 229
-       dpglossintensitymod  3
-       dpglossexponentmod  4
-       dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
+       q3map_bounceScale 1.5
+       dpoffsetmapping - 2 match8 162
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        {
-               map textures/exx/panel/panel_metal04.tga
-               
-
+               map textures/exx/trim/trim_baseboard02.tga
        }
        {
                map $lightmap
@@ -1248,23 +2210,18 @@ textures/exx/panel-metal04
                blendfunc filter
        }
 }
-textures/exx/panel-metal05
+textures/exx/trim-baseboard02
 {
-       qer_editorimage textures/exx/panel/panel_metal05.tga
-       
+       dpshaderkillifcvar cl_cubemaps_extra < 1
+       qer_editorimage textures/exx/trim/trim_baseboard02.tga
        surfaceparm metalsteps
-       q3map_bounceScale  2
-       dpoffsetmapping - 2 match8 238
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       q3map_bounceScale 1.5
+       dpoffsetmapping - 2 match8 162
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
        {
-               map textures/exx/panel/panel_metal05.tga
-               
-
+               map textures/exx/trim/trim_baseboard02.tga
        }
        {
                map $lightmap
@@ -1273,23 +2230,17 @@ textures/exx/panel-metal05
                blendfunc filter
        }
 }
-textures/exx/panel-metalbig04
+textures/exx/trim-baseboard03
 {
-       qer_editorimage textures/exx/panel/panel_metalbig04.tga
-       
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/trim/trim_baseboard03.tga
        surfaceparm metalsteps
-       q3map_bounceScale  2
-       dpoffsetmapping - 2 match8 165
-       dpglossintensitymod  3
-       dpglossexponentmod  4
-       dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
+       q3map_bounceScale 1.5
+       dpoffsetmapping - 2 match8 110
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        {
-               map textures/exx/panel/panel_metalbig04.tga
-               
-
+               map textures/exx/trim/trim_baseboard03.tga
        }
        {
                map $lightmap
@@ -1298,23 +2249,18 @@ textures/exx/panel-metalbig04
                blendfunc filter
        }
 }
-textures/exx/panel-metalbig04b
+textures/exx/trim-baseboard03
 {
-       qer_editorimage textures/exx/panel/panel_metalbig04b.tga
-       
+       dpshaderkillifcvar cl_cubemaps_extra < 1
+       qer_editorimage textures/exx/trim/trim_baseboard03.tga
        surfaceparm metalsteps
-       q3map_bounceScale  2
-       dpoffsetmapping - 2 match8 177
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       q3map_bounceScale 1.5
+       dpoffsetmapping - 2 match8 110
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
        {
-               map textures/exx/panel/panel_metalbig04b.tga
-               
-
+               map textures/exx/trim/trim_baseboard03.tga
        }
        {
                map $lightmap
@@ -1323,23 +2269,17 @@ textures/exx/panel-metalbig04b
                blendfunc filter
        }
 }
-textures/exx/panel-q201
+textures/exx/trim-metalsupp01
 {
-       qer_editorimage textures/exx/panel/panel_q201.tga
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/trim/trim_metalsupp01.tga
        surfaceparm metalsteps
-       
-       q3map_bounceScale  0.75
-       dpoffsetmapping - 2 match8 138
-       dpglossintensitymod  3
-       dpglossexponentmod  4
-       dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
+       q3map_bounceScale 2
+       dpoffsetmapping - 8 match8 243
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        {
-               map textures/exx/panel/panel_q201.tga
-               
-
+               map textures/exx/trim/trim_metalsupp01.tga
        }
        {
                map $lightmap
@@ -1348,23 +2288,18 @@ textures/exx/panel-q201
                blendfunc filter
        }
 }
-textures/exx/panel-q201b
+textures/exx/trim-metalsupp01
 {
-       qer_editorimage textures/exx/panel/panel_q201b.tga
-       
+       dpshaderkillifcvar cl_cubemaps_extra < 1
+       qer_editorimage textures/exx/trim/trim_metalsupp01.tga
        surfaceparm metalsteps
-       q3map_bounceScale  0.75
-       dpoffsetmapping - 2 match8 81
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       q3map_bounceScale 2
+       dpoffsetmapping - 8 match8 243
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
        {
-               map textures/exx/panel/panel_q201b.tga
-               
-
+               map textures/exx/trim/trim_metalsupp01.tga
        }
        {
                map $lightmap
@@ -1373,23 +2308,17 @@ textures/exx/panel-q201b
                blendfunc filter
        }
 }
-textures/exx/panel-q201c
+textures/exx/trim-psimple04
 {
-       qer_editorimage textures/exx/panel/panel_q201c.tga
-       
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/trim/trim_psimple04.tga
        surfaceparm metalsteps
-       q3map_bounceScale  0.75
-       dpoffsetmapping - 2 match8 98
-       dpglossintensitymod  3
-       dpglossexponentmod  4
-       dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
+       q3map_bounceScale 1.5
+       dpoffsetmapping - 2 match8 44
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        {
-               map textures/exx/panel/panel_q201c.tga
-               
-
+               map textures/exx/trim/trim_psimple04.tga
        }
        {
                map $lightmap
@@ -1398,23 +2327,18 @@ textures/exx/panel-q201c
                blendfunc filter
        }
 }
-textures/exx/panel-q201d
+textures/exx/trim-psimple04
 {
-       qer_editorimage textures/exx/panel/panel_q201d.tga
-       
+       dpshaderkillifcvar cl_cubemaps_extra < 1
+       qer_editorimage textures/exx/trim/trim_psimple04.tga
        surfaceparm metalsteps
-       q3map_bounceScale  0.75
-       dpoffsetmapping - 2 match8 189
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       q3map_bounceScale 1.5
+       dpoffsetmapping - 2 match8 44
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
        {
-               map textures/exx/panel/panel_q201d.tga
-               
-
+               map textures/exx/trim/trim_psimple04.tga
        }
        {
                map $lightmap
@@ -1423,23 +2347,17 @@ textures/exx/panel-q201d
                blendfunc filter
        }
 }
-textures/exx/panel-q201e
+textures/exx/trim-psimple05
 {
-       qer_editorimage textures/exx/panel/panel_q201e.tga
-       
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/trim/trim_psimple05.tga
        surfaceparm metalsteps
-       q3map_bounceScale  0.75
-       dpoffsetmapping - 2 match8 132
-       dpglossintensitymod  3
-       dpglossexponentmod  4
-       dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
+       q3map_bounceScale 1.5
+       dpoffsetmapping - 2 match8 230
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        {
-               map textures/exx/panel/panel_q201e.tga
-               
-
+               map textures/exx/trim/trim_psimple05.tga
        }
        {
                map $lightmap
@@ -1448,23 +2366,18 @@ textures/exx/panel-q201e
                blendfunc filter
        }
 }
-textures/exx/panel-rs01
+textures/exx/trim-psimple05
 {
-       qer_editorimage textures/exx/panel/panel_rs01.tga
-       
+       dpshaderkillifcvar cl_cubemaps_extra < 1
+       qer_editorimage textures/exx/trim/trim_psimple05.tga
        surfaceparm metalsteps
-       q3map_bounceScale  0.75
-       dpoffsetmapping - 2 match8 178
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       q3map_bounceScale 1.5
+       dpoffsetmapping - 2 match8 230
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
        {
-               map textures/exx/panel/panel_rs01.tga
-               
-
+               map textures/exx/trim/trim_psimple05.tga
        }
        {
                map $lightmap
@@ -1473,23 +2386,17 @@ textures/exx/panel-rs01
                blendfunc filter
        }
 }
-textures/exx/trim-01
+textures/exx/trim-simple01
 {
-       qer_editorimage textures/exx/trim/trim_01.tga
-       
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/trim/trim_simple01.tga
        surfaceparm metalsteps
-       q3map_bounceScale  1.5
-       dpoffsetmapping - 2 match8 169
-       dpglossintensitymod  3
-       dpglossexponentmod  4
-       dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
+       q3map_bounceScale 1.75
+       dpoffsetmapping - 2 match8 213
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        {
-               map textures/exx/trim/trim_01.tga
-               
-
+               map textures/exx/trim/trim_simple01.tga
        }
        {
                map $lightmap
@@ -1498,23 +2405,19 @@ textures/exx/trim-01
                blendfunc filter
        }
 }
-textures/exx/trim-baseboard
+textures/exx/trim-simple01
 {
-       qer_editorimage textures/exx/trim/trim_baseboard.tga
-       
+       dpshaderkillifcvar cl_cubemaps_extra < 1
+       qer_editorimage textures/exx/trim/trim_simple01.tga
        surfaceparm metalsteps
-       q3map_bounceScale  1.5
-       dpoffsetmapping - 2 match8 181
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       q3map_bounceScale 1.75
+       dpoffsetmapping - 2 match8 213
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
        {
-               map textures/exx/trim/trim_baseboard.tga                
+               map textures/exx/trim/trim_simple01.tga
        }
-
        {
                map $lightmap
                rgbGen identity
@@ -1522,23 +2425,17 @@ textures/exx/trim-baseboard
                blendfunc filter
        }
 }
-textures/exx/trim-baseboard02
+textures/exx/trim-simple03
 {
-       qer_editorimage textures/exx/trim/trim_baseboard02.tga
-       
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/trim/trim_simple03.tga
        surfaceparm metalsteps
-       q3map_bounceScale  1.5
-       dpoffsetmapping - 2 match8 162
-       dpglossintensitymod  3
-       dpglossexponentmod  4
-       dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
+       q3map_bounceScale 0.75
+       dpoffsetmapping - 2 match8 142
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        {
-               map textures/exx/trim/trim_baseboard02.tga
-               
-
+               map textures/exx/trim/trim_simple03.tga
        }
        {
                map $lightmap
@@ -1547,23 +2444,18 @@ textures/exx/trim-baseboard02
                blendfunc filter
        }
 }
-textures/exx/trim-baseboard03
+textures/exx/trim-simple03
 {
-       qer_editorimage textures/exx/trim/trim_baseboard03.tga
-       
+       dpshaderkillifcvar cl_cubemaps_extra < 1
+       qer_editorimage textures/exx/trim/trim_simple03.tga
        surfaceparm metalsteps
-       q3map_bounceScale  1.5
-       dpoffsetmapping - 2 match8 110
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       q3map_bounceScale 0.75
+       dpoffsetmapping - 2 match8 142
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
        {
-               map textures/exx/trim/trim_baseboard03.tga
-               
-
+               map textures/exx/trim/trim_simple03.tga
        }
        {
                map $lightmap
@@ -1572,23 +2464,17 @@ textures/exx/trim-baseboard03
                blendfunc filter
        }
 }
-textures/exx/trim-metalsupp01
+textures/exx/trim-steptop01
 {
-       qer_editorimage textures/exx/trim/trim_metalsupp01.tga
-       
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/trim/trim_steptop01.tga
        surfaceparm metalsteps
-       q3map_bounceScale  2
-       dpoffsetmapping - 8 match8 243
-       dpglossintensitymod  3
-       dpglossexponentmod  4
-       dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
+       q3map_bounceScale 0.75
+       dpoffsetmapping - 2 match8 140
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        {
-               map textures/exx/trim/trim_metalsupp01.tga
-               
-
+               map textures/exx/trim/trim_steptop01.tga
        }
        {
                map $lightmap
@@ -1597,23 +2483,18 @@ textures/exx/trim-metalsupp01
                blendfunc filter
        }
 }
-textures/exx/trim-psimple04
+textures/exx/trim-steptop01
 {
-       qer_editorimage textures/exx/trim/trim_psimple04.tga
-       
+       dpshaderkillifcvar cl_cubemaps_extra < 1
+       qer_editorimage textures/exx/trim/trim_steptop01.tga
        surfaceparm metalsteps
-       q3map_bounceScale  1.5
-       dpoffsetmapping - 2 match8 44
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       q3map_bounceScale 0.75
+       dpoffsetmapping - 2 match8 140
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
        {
-               map textures/exx/trim/trim_psimple04.tga
-               
-
+               map textures/exx/trim/trim_steptop01.tga
        }
        {
                map $lightmap
@@ -1622,23 +2503,17 @@ textures/exx/trim-psimple04
                blendfunc filter
        }
 }
-textures/exx/trim-psimple05
+textures/exx/trim-support03
 {
-       qer_editorimage textures/exx/trim/trim_psimple05.tga
-       
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/trim/trim_support03.tga
        surfaceparm metalsteps
-       q3map_bounceScale  1.5
-       dpoffsetmapping - 2 match8 230
-       dpglossintensitymod  3
-       dpglossexponentmod  4
-       dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
+       q3map_bounceScale 1.5
+       dpoffsetmapping - 2 match8 111
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        {
-               map textures/exx/trim/trim_psimple05.tga
-               
-
+               map textures/exx/trim/trim_support03.tga
        }
        {
                map $lightmap
@@ -1647,23 +2522,18 @@ textures/exx/trim-psimple05
                blendfunc filter
        }
 }
-textures/exx/trim-simple01
+textures/exx/trim-support03
 {
-       qer_editorimage textures/exx/trim/trim_simple01.tga
-       
+       dpshaderkillifcvar cl_cubemaps_extra < 1
+       qer_editorimage textures/exx/trim/trim_support03.tga
        surfaceparm metalsteps
-       q3map_bounceScale  1.75
-       dpoffsetmapping - 2 match8 213
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       q3map_bounceScale 1.5
+       dpoffsetmapping - 2 match8 111
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
        {
-               map textures/exx/trim/trim_simple01.tga
-               
-
+               map textures/exx/trim/trim_support03.tga
        }
        {
                map $lightmap
@@ -1672,23 +2542,17 @@ textures/exx/trim-simple01
                blendfunc filter
        }
 }
-textures/exx/trim-simple03
+textures/exx/trim-vert01
 {
-       qer_editorimage textures/exx/trim/trim_simple03.tga
-       
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/trim/trim_vert01.tga
        surfaceparm metalsteps
-       q3map_bounceScale  0.75
-       dpoffsetmapping - 2 match8 142
-       dpglossintensitymod  3
-       dpglossexponentmod  4
-       dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
+       q3map_bounceScale 1.5
+       dpoffsetmapping - 2 match8 231
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        {
-               map textures/exx/trim/trim_simple03.tga
-               
-
+               map textures/exx/trim/trim_vert01.tga
        }
        {
                map $lightmap
@@ -1697,23 +2561,18 @@ textures/exx/trim-simple03
                blendfunc filter
        }
 }
-textures/exx/trim-steptop01
+textures/exx/trim-vert01
 {
-       qer_editorimage textures/exx/trim/trim_steptop01.tga
-       
+       dpshaderkillifcvar cl_cubemaps_extra < 1
+       qer_editorimage textures/exx/trim/trim_vert01.tga
        surfaceparm metalsteps
-       q3map_bounceScale  0.75
-       dpoffsetmapping - 2 match8 140
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       q3map_bounceScale 1.5
+       dpoffsetmapping - 2 match8 231
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
        {
-               map textures/exx/trim/trim_steptop01.tga
-               
-
+               map textures/exx/trim/trim_vert01.tga
        }
        {
                map $lightmap
@@ -1722,23 +2581,17 @@ textures/exx/trim-steptop01
                blendfunc filter
        }
 }
-textures/exx/trim-support03
+textures/exx/trim-horz01
 {
-       qer_editorimage textures/exx/trim/trim_support03.tga
-       
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/trim/trim_horz01.tga
        surfaceparm metalsteps
-       q3map_bounceScale  1.5
-       dpoffsetmapping - 2 match8 111
-       dpglossintensitymod  3
-       dpglossexponentmod  4
-       dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
+       q3map_bounceScale 1.5
+       dpoffsetmapping - 2 match8 231
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        {
-               map textures/exx/trim/trim_support03.tga
-               
-
+               map textures/exx/trim/trim_horz01.tga
        }
        {
                map $lightmap
@@ -1747,23 +2600,18 @@ textures/exx/trim-support03
                blendfunc filter
        }
 }
-textures/exx/trim-vert01
+textures/exx/trim-horz01
 {
-       qer_editorimage textures/exx/trim/trim_vert01.tga
-       
+       dpshaderkillifcvar cl_cubemaps_extra < 1
+       qer_editorimage textures/exx/trim/trim_horz01.tga
        surfaceparm metalsteps
-       q3map_bounceScale  1.5
+       q3map_bounceScale 1.5
        dpoffsetmapping - 2 match8 231
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
        {
-               map textures/exx/trim/trim_vert01.tga
-               
-
+               map textures/exx/trim/trim_horz01.tga
        }
        {
                map $lightmap
@@ -1772,23 +2620,17 @@ textures/exx/trim-vert01
                blendfunc filter
        }
 }
-textures/exx/trim-horz01
+textures/exx/wall-bigrib02
 {
-       qer_editorimage textures/exx/trim/trim_horz01.tga
-       
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/wall/wall_bigrib02.tga
        surfaceparm metalsteps
-       q3map_bounceScale  1.5
-       dpoffsetmapping - 2 match8 231
-       dpglossintensitymod  3
-       dpglossexponentmod  4
-       dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
+       q3map_bounceScale 1.75
+       dpoffsetmapping - 2 match8 250
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        {
-               map textures/exx/trim/trim_horz01.tga
-               
-
+               map textures/exx/wall/wall_bigrib02.tga
        }
        {
                map $lightmap
@@ -1797,24 +2639,18 @@ textures/exx/trim-horz01
                blendfunc filter
        }
 }
-
 textures/exx/wall-bigrib02
 {
+       dpshaderkillifcvar cl_cubemaps_extra < 1
        qer_editorimage textures/exx/wall/wall_bigrib02.tga
-       
        surfaceparm metalsteps
-       q3map_bounceScale  1.75
+       q3map_bounceScale 1.75
        dpoffsetmapping - 2 match8 250
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
        {
                map textures/exx/wall/wall_bigrib02.tga
-               
-
        }
        {
                map $lightmap
@@ -1825,21 +2661,35 @@ textures/exx/wall-bigrib02
 }
 textures/exx/wall-bplate06
 {
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/wall/wall_bplate06.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 1.75
+       dpoffsetmapping - 8 match8 114
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       {
+               map textures/exx/wall/wall_bplate06.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/wall-bplate06
+{
+       dpshaderkillifcvar cl_cubemaps_extra < 1
        qer_editorimage textures/exx/wall/wall_bplate06.tga
-       
        surfaceparm metalsteps
-       q3map_bounceScale  1.75
+       q3map_bounceScale 1.75
        dpoffsetmapping - 8 match8 114
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
        {
                map textures/exx/wall/wall_bplate06.tga
-               
-
        }
        {
                map $lightmap
@@ -1851,17 +2701,12 @@ textures/exx/wall-bplate06
 textures/exx/wall-crete01
 {
        qer_editorimage textures/exx/wall/wall_crete01.tga
-       
-       q3map_bounceScale  0.5
+       q3map_bounceScale 0.5
        dpoffsetmapping - 2 match8 44
-       dpglossintensitymod  1
-       dpglossexponentmod  1
-
-
+       dpglossintensitymod 1
+       dpglossexponentmod 1
        {
                map textures/exx/wall/wall_crete01.tga
-               
-
        }
        {
                map $lightmap
@@ -1873,17 +2718,12 @@ textures/exx/wall-crete01
 textures/exx/wall-crete02
 {
        qer_editorimage textures/exx/wall/wall_crete02.tga
-       
-       q3map_bounceScale  0.5
+       q3map_bounceScale 0.5
        dpoffsetmapping - 2 match8 242
-       dpglossintensitymod  1
-       dpglossexponentmod  1
-
-
+       dpglossintensitymod 1
+       dpglossexponentmod 1
        {
                map textures/exx/wall/wall_crete02.tga
-               
-
        }
        {
                map $lightmap
@@ -1895,17 +2735,12 @@ textures/exx/wall-crete02
 textures/exx/wall-crete03
 {
        qer_editorimage textures/exx/wall/wall_crete03.tga
-       
-       q3map_bounceScale  0.5
+       q3map_bounceScale 0.5
        dpoffsetmapping - 2 match8 233
-       dpglossintensitymod  1
-       dpglossexponentmod  1
-
-
+       dpglossintensitymod 1
+       dpglossexponentmod 1
        {
                map textures/exx/wall/wall_crete03.tga
-               
-
        }
        {
                map $lightmap
@@ -1917,17 +2752,12 @@ textures/exx/wall-crete03
 textures/exx/wall-crete03b
 {
        qer_editorimage textures/exx/wall/wall_crete03b.tga
-       
-       q3map_bounceScale  0.5
+       q3map_bounceScale 0.5
        dpoffsetmapping - 2 match8 38
-       dpglossintensitymod  1
-       dpglossexponentmod  1
-
-
+       dpglossintensitymod 1
+       dpglossexponentmod 1
        {
                map textures/exx/wall/wall_crete03b.tga
-               
-
        }
        {
                map $lightmap
@@ -1938,21 +2768,35 @@ textures/exx/wall-crete03b
 }
 textures/exx/wall-des01
 {
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/wall/wall_des01.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 1.75
+       dpoffsetmapping - 2 match8 55
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       {
+               map textures/exx/wall/wall_des01.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/wall-des01
+{
+       dpshaderkillifcvar cl_cubemaps_extra < 1
        qer_editorimage textures/exx/wall/wall_des01.tga
-
-       surfaceparm metalsteps  
-       q3map_bounceScale  1.75
+       surfaceparm metalsteps
+       q3map_bounceScale 1.75
        dpoffsetmapping - 2 match8 55
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
        {
                map textures/exx/wall/wall_des01.tga
-               
-
        }
        {
                map $lightmap
@@ -1963,21 +2807,35 @@ textures/exx/wall-des01
 }
 textures/exx/wall-metal01
 {
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/wall/wall_metal01.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 2
+       dpoffsetmapping - 2 match8 225
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       {
+               map textures/exx/wall/wall_metal01.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/wall-metal01
+{
+       dpshaderkillifcvar cl_cubemaps_extra < 1
        qer_editorimage textures/exx/wall/wall_metal01.tga
-       
        surfaceparm metalsteps
-       q3map_bounceScale  2
+       q3map_bounceScale 2
        dpoffsetmapping - 2 match8 225
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
        {
                map textures/exx/wall/wall_metal01.tga
-               
-
        }
        {
                map $lightmap
@@ -1988,21 +2846,35 @@ textures/exx/wall-metal01
 }
 textures/exx/wall-metal01b
 {
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/wall/wall_metal01b.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 2
+       dpoffsetmapping - 2 match8 225
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       {
+               map textures/exx/wall/wall_metal01b.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/wall-metal01b
+{
+       dpshaderkillifcvar cl_cubemaps_extra < 1
        qer_editorimage textures/exx/wall/wall_metal01b.tga
-       
        surfaceparm metalsteps
-       q3map_bounceScale  2
+       q3map_bounceScale 2
        dpoffsetmapping - 2 match8 225
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
        {
                map textures/exx/wall/wall_metal01b.tga
-               
-
        }
        {
                map $lightmap
@@ -2014,18 +2886,13 @@ textures/exx/wall-metal01b
 textures/exx/wall-metal01c
 {
        qer_editorimage textures/exx/wall/wall_metal01c.tga
-       
        surfaceparm metalsteps
-       q3map_bounceScale  2
+       q3map_bounceScale 2
        dpoffsetmapping - 2 match8 225
-       dpglossintensitymod  3
-       dpglossexponentmod  4
-
-
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        {
                map textures/exx/wall/wall_metal01c.tga
-               
-
        }
        {
                map $lightmap
@@ -2036,21 +2903,35 @@ textures/exx/wall-metal01c
 }
 textures/exx/wall-metal02
 {
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/wall/wall_metal02.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 2
+       dpoffsetmapping - 2 match8 177
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       {
+               map textures/exx/wall/wall_metal02.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/wall-metal02
+{
+       dpshaderkillifcvar cl_cubemaps_extra < 1
        qer_editorimage textures/exx/wall/wall_metal02.tga
-       
        surfaceparm metalsteps
-       q3map_bounceScale  2
+       q3map_bounceScale 2
        dpoffsetmapping - 2 match8 177
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
        {
                map textures/exx/wall/wall_metal02.tga
-               
-
        }
        {
                map $lightmap
@@ -2061,21 +2942,35 @@ textures/exx/wall-metal02
 }
 textures/exx/wall-metalb01
 {
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/wall/wall_metalb01.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 2
+       dpoffsetmapping - 1 match8 37
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       {
+               map textures/exx/wall/wall_metalb01.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/wall-metalb01
+{
+       dpshaderkillifcvar cl_cubemaps_extra < 1
        qer_editorimage textures/exx/wall/wall_metalb01.tga
-       
        surfaceparm metalsteps
-       q3map_bounceScale  2
+       q3map_bounceScale 2
        dpoffsetmapping - 1 match8 37
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
        {
                map textures/exx/wall/wall_metalb01.tga
-               
-
        }
        {
                map $lightmap
@@ -2086,21 +2981,35 @@ textures/exx/wall-metalb01
 }
 textures/exx/wall-metalrib01
 {
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/wall/wall_metalrib01.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 2
+       dpoffsetmapping - 2 match8 216
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       {
+               map textures/exx/wall/wall_metalrib01.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/wall-metalrib01
+{
+       dpshaderkillifcvar cl_cubemaps_extra < 1
        qer_editorimage textures/exx/wall/wall_metalrib01.tga
-       
        surfaceparm metalsteps
-       q3map_bounceScale  2
+       q3map_bounceScale 2
        dpoffsetmapping - 2 match8 216
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
        {
                map textures/exx/wall/wall_metalrib01.tga
-               
-
        }
        {
                map $lightmap
@@ -2111,21 +3020,35 @@ textures/exx/wall-metalrib01
 }
 textures/exx/wall-panel05
 {
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/wall/wall_panel05.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 1.75
+       dpoffsetmapping - 2 match8 66
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       {
+               map textures/exx/wall/wall_panel05.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/wall-panel05
+{
+       dpshaderkillifcvar cl_cubemaps_extra < 1
        qer_editorimage textures/exx/wall/wall_panel05.tga
-       
        surfaceparm metalsteps
-       q3map_bounceScale  1.75
+       q3map_bounceScale 1.75
        dpoffsetmapping - 2 match8 66
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
        {
                map textures/exx/wall/wall_panel05.tga
-               
-
        }
        {
                map $lightmap
@@ -2136,21 +3059,35 @@ textures/exx/wall-panel05
 }
 textures/exx/wall-panels08
 {
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/wall/wall_panels08.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 1.75
+       dpoffsetmapping - 2 match8 195
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       {
+               map textures/exx/wall/wall_panels08.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/wall-panels08
+{
+       dpshaderkillifcvar cl_cubemaps_extra < 1
        qer_editorimage textures/exx/wall/wall_panels08.tga
-       
        surfaceparm metalsteps
-       q3map_bounceScale  1.75
+       q3map_bounceScale 1.75
        dpoffsetmapping - 2 match8 195
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
        {
                map textures/exx/wall/wall_panels08.tga
-               
-
        }
        {
                map $lightmap
@@ -2161,21 +3098,35 @@ textures/exx/wall-panels08
 }
 textures/exx/wall-panels08b
 {
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/wall/wall_panels08b.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 1.75
+       dpoffsetmapping - 2 match8 195
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       {
+               map textures/exx/wall/wall_panels08b.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/wall-panels08b
+{
+       dpshaderkillifcvar cl_cubemaps_extra < 1
        qer_editorimage textures/exx/wall/wall_panels08b.tga
-       
        surfaceparm metalsteps
-       q3map_bounceScale  1.75
+       q3map_bounceScale 1.75
        dpoffsetmapping - 2 match8 195
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
        {
                map textures/exx/wall/wall_panels08b.tga
-               
-
        }
        {
                map $lightmap
@@ -2186,21 +3137,35 @@ textures/exx/wall-panels08b
 }
 textures/exx/wall-pipe
 {
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/wall/wall_pipe.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 1.25
+       dpoffsetmapping - 2 match8 157
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       {
+               map textures/exx/wall/wall_pipe.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/wall-pipe
+{
+       dpshaderkillifcvar cl_cubemaps_extra < 1
        qer_editorimage textures/exx/wall/wall_pipe.tga
-       
        surfaceparm metalsteps
-       q3map_bounceScale  1.25
+       q3map_bounceScale 1.25
        dpoffsetmapping - 2 match8 157
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
        {
                map textures/exx/wall/wall_pipe.tga
-               
-
        }
        {
                map $lightmap
@@ -2211,21 +3176,35 @@ textures/exx/wall-pipe
 }
 textures/exx/wall-u207
 {
+       dpshaderkillifcvar cl_cubemaps_extra >= 1
+       qer_editorimage textures/exx/wall/wall_u207.tga
+       surfaceparm metalsteps
+       q3map_bounceScale 1.75
+       dpoffsetmapping - 2 match8 109
+       dpglossintensitymod 3
+       dpglossexponentmod 4
+       {
+               map textures/exx/wall/wall_u207.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/wall-u207
+{
+       dpshaderkillifcvar cl_cubemaps_extra < 1
        qer_editorimage textures/exx/wall/wall_u207.tga
-       
        surfaceparm metalsteps
-       q3map_bounceScale  1.75
+       q3map_bounceScale 1.75
        dpoffsetmapping - 2 match8 109
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        dpreflectcube env/exomorph/exomorph
-
-       dpshaderkillifcvar g_cubemap == 0
-
        {
                map textures/exx/wall/wall_u207.tga
-               
-
        }
        {
                map $lightmap

diff --git a/scripts/exx.shader.in b/scripts/exx.shader.in
index 3207f52447ace6e5e819a12f2b22b4eb6ffec4a2..e5541427d7347b33dff330409c65c6d0c2e262c6 100644 (file)
--- a/scripts/exx.shader.in
+++ b/scripts/exx.shader.in
@@ -118,7 +118,7 @@ textures/exx/base-metal01
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -144,7 +144,7 @@ textures/exx/base-metal02
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -170,7 +170,7 @@ textures/exx/base-metal03
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -196,7 +196,7 @@ textures/exx/base-metal04
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -222,7 +222,7 @@ textures/exx/base-metal05rust
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -248,7 +248,7 @@ textures/exx/base-metal06rust
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -274,7 +274,7 @@ textures/exx/base-metal07rust
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -300,7 +300,7 @@ textures/exx/floor-clang01
        dpglossexponentmod  4
        surfaceparm metalsteps
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -326,7 +326,7 @@ textures/exx/floor-clang01b
        dpglossexponentmod  4
        surfaceparm metalsteps
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -443,7 +443,7 @@ textures/exx/floor-grate01
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -470,7 +470,7 @@ textures/exx/floor-grate01-cull
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -498,7 +498,7 @@ textures/exx/floor-grate02
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -525,7 +525,7 @@ textures/exx/floor-grate02-cull
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -553,7 +553,7 @@ textures/exx/floor-grate03
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -580,7 +580,7 @@ textures/exx/floor-grate03-cull
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -608,7 +608,7 @@ textures/exx/floor-grate04
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -636,7 +636,7 @@ textures/exx/floor-grate04-cull
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -663,7 +663,7 @@ textures/exx/floor-metal02
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -688,7 +688,7 @@ textures/exx/floor-panel01
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -714,7 +714,7 @@ textures/exx/floor-rnd01
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -740,7 +740,7 @@ textures/exx/floor-rnd02
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -766,7 +766,7 @@ textures/exx/floor-simple05
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -791,7 +791,7 @@ textures/exx/floor-simplines
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -817,7 +817,7 @@ textures/exx/floor-tile03
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -843,7 +843,7 @@ textures/exx/floor-tread01
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -960,7 +960,7 @@ textures/exx/light-panel01
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -989,7 +989,7 @@ textures/exx/light-panel01-surfacelight
        q3map_lightSubdivide 64
 
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -1015,7 +1015,7 @@ textures/exx/light-u201
        dpglossexponentmod  4
 
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -1044,7 +1044,7 @@ textures/exx/light-u201-surfacelight
        q3map_lightSubdivide 64
 
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -1079,7 +1079,7 @@ textures/exx/panel-grate01
        nomipmaps
 
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -1113,7 +1113,7 @@ textures/exx/panel-grate01-cull
        nomipmaps
 
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -1139,7 +1139,7 @@ textures/exx/panel-metal01
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -1165,7 +1165,7 @@ textures/exx/panel-metal01b
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -1191,7 +1191,7 @@ textures/exx/panel-metal01c
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -1217,7 +1217,7 @@ textures/exx/panel-metal02
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -1243,7 +1243,7 @@ textures/exx/panel-metal03
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -1269,7 +1269,7 @@ textures/exx/panel-metal04
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -1295,7 +1295,7 @@ textures/exx/panel-metal05
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -1321,7 +1321,7 @@ textures/exx/panel-metalbig04
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -1347,7 +1347,7 @@ textures/exx/panel-metalbig04b
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -1373,7 +1373,7 @@ textures/exx/panel-q201
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -1399,7 +1399,7 @@ textures/exx/panel-q201b
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -1425,7 +1425,7 @@ textures/exx/panel-q201c
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -1451,7 +1451,7 @@ textures/exx/panel-q201d
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -1477,7 +1477,7 @@ textures/exx/panel-q201e
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -1503,7 +1503,7 @@ textures/exx/panel-rs01
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -1529,7 +1529,7 @@ textures/exx/trim-01
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -1555,7 +1555,7 @@ textures/exx/trim-baseboard
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -1580,7 +1580,7 @@ textures/exx/trim-baseboard02
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -1606,7 +1606,7 @@ textures/exx/trim-baseboard03
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -1632,7 +1632,7 @@ textures/exx/trim-metalsupp01
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -1658,7 +1658,7 @@ textures/exx/trim-psimple04
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -1684,7 +1684,7 @@ textures/exx/trim-psimple05
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -1710,7 +1710,7 @@ textures/exx/trim-simple01
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -1736,7 +1736,7 @@ textures/exx/trim-simple03
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -1762,7 +1762,7 @@ textures/exx/trim-steptop01
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -1788,7 +1788,7 @@ textures/exx/trim-support03
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -1814,7 +1814,7 @@ textures/exx/trim-vert01
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -1840,7 +1840,7 @@ textures/exx/trim-horz01
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -1867,7 +1867,7 @@ textures/exx/wall-bigrib02
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -1893,7 +1893,7 @@ textures/exx/wall-bplate06
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -2007,7 +2007,7 @@ textures/exx/wall-des01
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -2033,7 +2033,7 @@ textures/exx/wall-metal01
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -2059,7 +2059,7 @@ textures/exx/wall-metal01b
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -2108,7 +2108,7 @@ textures/exx/wall-metal02
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -2134,7 +2134,7 @@ textures/exx/wall-metalb01
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -2160,7 +2160,7 @@ textures/exx/wall-metalrib01
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -2186,7 +2186,7 @@ textures/exx/wall-panel05
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -2212,7 +2212,7 @@ textures/exx/wall-panels08
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -2238,7 +2238,7 @@ textures/exx/wall-panels08b
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -2264,7 +2264,7 @@ textures/exx/wall-pipe
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif
 
@@ -2290,7 +2290,7 @@ textures/exx/wall-u207
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-#if r_reflections_world
+#if cl_cubemaps_extra >= 1
        dpreflectcube env/exomorph/exomorph
 #endif