Merge two shaders which I don't understand why were separate at all

diff --git a/data/scripts/e8.shader b/data/scripts/e8.shader
index 77a79d10809a0222cdd15a8ac5c737efb68c6e62..fbf7e9ea4e25659f9b36ee48cc05292c64df8822 100644 (file)
--- a/data/scripts/e8.shader
+++ b/data/scripts/e8.shader
@@ -2,14 +2,23 @@ textures/e8/e8_launchpad1
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        surfaceparm metalsteps\r
-       {\r
-               map textures/e8/e8_launchpad1\r
+       q3map_surfacelight 100\r
+       {\r
+               map textures/e8/e8_launchpad1_fx.tga\r
+               rgbGen identity\r
+               tcMod scroll 0 3\r
+       }\r
+       {\r
+               map textures/e8/e8_launchpad1.tga\r
+               blendfunc blend\r
+               rgbGen identity\r
        }\r
        {\r
                map $lightmap\r
-               blendfunc GL_DST_COLOR GL_ZERO\r
+               blendfunc gl_dst_color gl_one_minus_dst_alpha\r
                rgbGen identity\r
-    }\r
+               tcGen lightmap\r
+       }\r
 }\r
 \r
 textures/e8/e8bolttrim\r
@@ -86,14 +95,22 @@ textures/e8/e8rail2
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        surfaceparm metalsteps\r
-       {\r
-               map textures/e8/e8rail2\r
+       surfaceparm alphashadow\r
+       cull disable\r
+       nomipmaps\r
+       {\r
+               map textures/e8/e8rail2.tga\r
+               rgbGen identity\r
+               depthWrite\r
+               alphaFunc GE128\r
        }\r
        {\r
                map $lightmap\r
-               blendfunc GL_DST_COLOR GL_ZERO\r
+               blendfunc filter\r
                rgbGen identity\r
-    }\r
+               tcGen lightmap\r
+               depthFunc equal\r
+       }\r
 }\r
 \r
 textures/e8/e8tinylightblue\r
@@ -114,28 +131,40 @@ textures/e8/e8trimlight
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        surfaceparm metalsteps\r
-       {\r
-               map textures/e8/e8trimlight\r
-       }\r
+       q3map_lightimage textures/e8/e8trimlight_fx.tga\r
+       q3map_surfacelight 100\r
        {\r
                map $lightmap\r
-               blendfunc GL_DST_COLOR GL_ZERO\r
                rgbGen identity\r
-    }\r
+               tcGen lightmap\r
+       }\r
+       {\r
+               map textures/e8/e8trimlight.tga\r
+               blendfunc filter\r
+               rgbGen identity\r
+       }\r
+       {\r
+               map textures/e8/e8trimlight_fx.tga\r
+               blendfunc add\r
+               tcMod scroll -2 0\r
+       }\r
 }\r
 \r
 textures/e8/e8trimlight2\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        surfaceparm metalsteps\r
-       {\r
-               map textures/e8/e8trimlight2\r
+       qer_editorimage textures/e8/e8trimlight2.tga\r
+       surfaceparm nomarks\r
+       q3map_surfacelight 400\r
+       {\r
+               map textures/e8/e8trimlight2.tga\r
        }\r
        {\r
                map $lightmap\r
-               blendfunc GL_DST_COLOR GL_ZERO\r
-               rgbGen identity\r
-    }\r
+               blendfunc filter\r
+               tcGen lightmap\r
+       }\r
 }\r
 \r
 textures/e8/e8warning2\r
@@ -155,43 +184,65 @@ textures/e8/e8warning2
 textures/e8/e8xgirder\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
+       surfaceparm alphashadow\r
        surfaceparm metalsteps\r
-       {\r
-               map textures/e8/e8xgirder\r
+       surfaceparm nomarks\r
+       surfaceparm trans\r
+       cull disable\r
+       nopicmip\r
+       {\r
+               map textures/e8/e8xgirder.tga\r
+               rgbGen identity\r
+               depthWrite\r
+               alphaFunc GE128\r
        }\r
        {\r
                map $lightmap\r
-               blendfunc GL_DST_COLOR GL_ZERO\r
+               blendfunc filter\r
                rgbGen identity\r
-    }\r
+               tcGen lightmap\r
+               depthFunc equal\r
+       }\r
 }\r
 \r
 textures/e8/e8xgirder_small\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        surfaceparm metalsteps\r
-       {\r
-               map textures/e8/e8xgirder_small\r
+       cull disable\r
+       {\r
+               map textures/e8/e8xgirder_small.tga\r
+               rgbGen identity\r
+               depthWrite\r
+               alphaFunc GE128\r
        }\r
        {\r
                map $lightmap\r
-               blendfunc GL_DST_COLOR GL_ZERO\r
+               blendfunc filter\r
                rgbGen identity\r
-    }\r
+               tcGen lightmap\r
+               depthFunc equal\r
+       }\r
 }\r
 \r
 textures/e8/e8xgirder_small2\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        surfaceparm metalsteps\r
-       {\r
-               map textures/e8/e8xgirder_small2\r
+       cull disable\r
+       {\r
+               map textures/e8/e8xgirder_small2.tga\r
+               rgbGen identity\r
+               depthWrite\r
+               alphaFunc GE128\r
        }\r
        {\r
                map $lightmap\r
-               blendfunc GL_DST_COLOR GL_ZERO\r
+               blendfunc filter\r
                rgbGen identity\r
-    }\r
+               tcGen lightmap\r
+               depthFunc equal\r
+       }\r
 }\r
 \r
 textures/e8/e8jumpspawn02b\r
@@ -240,4 +291,248 @@ textures/e8/e8_base1broke
                map textures/e8/e8_base1broke\r
                rgbGen vertex\r
        }\r
-}
\ No newline at end of file
+}\r
+\r
+textures/e8/e8alphaspawn\r
+{\r
+       surfaceparm nomarks\r
+       surfaceparm trans\r
+       surfaceparm pointlight\r
+       {\r
+               map textures/e8/e8alphaspawn.tga\r
+               blendfunc add\r
+               rgbGen Vertex\r
+       }\r
+}\r
+\r
+textures/e8/e8yarrow\r
+{\r
+       surfaceparm nomarks\r
+       surfaceparm trans\r
+       surfaceparm pointlight\r
+       {\r
+               map textures/e8/e8yarrow.tga\r
+               blendfunc add\r
+               rgbGen Vertex\r
+       }\r
+}\r
+\r
+textures/e8/e8lightblue_flicker\r
+{\r
+       qer_editorimage textures/e8/e8tinylightblue.tga\r
+       surfaceparm nomarks\r
+       q3map_surfacelight 950\r
+       {\r
+               map textures/e8/e8tinylightblue.tga\r
+       }\r
+       {\r
+               map $lightmap\r
+               blendfunc filter\r
+               tcGen lightmap\r
+       }\r
+}\r
+\r
+textures/e8/zap_e8\r
+{\r
+       qer_editorimage textures/sfx/zap_scroll.tga\r
+       //q3map_surfacelight    300\r
+       surfaceparm     trans\r
+       surfaceparm nomarks\r
+       surfaceparm nolightmap\r
+       cull none\r
+       {\r
+               Map textures/sfx/zap_scroll.tga\r
+               blendFunc GL_ONE GL_ONE\r
+               rgbgen wave triangle .8 2 0 7\r
+               tcMod scroll 0 1\r
+       }\r
+       {\r
+               Map textures/sfx/zap_scroll.tga\r
+               blendFunc GL_ONE GL_ONE\r
+               rgbgen wave triangle 1 1.4 0 5\r
+               tcMod scale  -1 1\r
+               tcMod scroll 0 1\r
+       }\r
+       {\r
+               Map textures/sfx/zap_scroll2.tga\r
+               blendFunc GL_ONE GL_ONE\r
+               rgbgen wave triangle 1 1.4 0 6.3\r
+               tcMod scale  -1 1\r
+               tcMod scroll 2 1\r
+       }\r
+       {\r
+               Map textures/sfx/zap_scroll2.tga\r
+               blendFunc GL_ONE GL_ONE\r
+               rgbgen wave triangle 1 1.4 0 7.7\r
+               tcMod scroll -1.3 1\r
+       }\r
+}\r
+\r
+textures/e8/e8lighttrim_static\r
+{\r
+       qer_editorimage textures/e8/e8lighttrim.tga\r
+       surfaceparm nomarks\r
+       q3map_surfacelight 400\r
+       {\r
+               map textures/e8/e8lighttrim.tga\r
+       }\r
+       {\r
+               map $lightmap\r
+               blendfunc filter\r
+               tcGen lightmap\r
+       }\r
+}\r
+\r
+textures/e8/e8lighttrim_glow\r
+{\r
+       qer_editorimage textures/e8/e8lighttrim.tga\r
+       surfaceparm nomarks\r
+       q3map_surfacelight 400\r
+       {\r
+               map textures/e8/e8lighttrim.tga\r
+       }\r
+       {\r
+               map $lightmap\r
+               blendfunc filter\r
+               tcGen lightmap\r
+       }\r
+}\r
+\r
+textures/e8/e8lighttrim_b_static\r
+{\r
+       qer_editorimage textures/e8/e8lighttrim_b.tga\r
+       surfaceparm nomarks\r
+       q3map_surfacelight 400\r
+       {\r
+               map textures/e8/e8lighttrim_b.tga\r
+       }\r
+       {\r
+               map $lightmap\r
+               blendfunc filter\r
+               tcGen lightmap\r
+       }\r
+       }\r
+\r
+textures/e8/e8lighttrim_b_glow\r
+{\r
+       qer_editorimage textures/e8/e8lighttrim_b.tga\r
+       surfaceparm nomarks\r
+       q3map_surfacelight 400\r
+       {\r
+               map textures/e8/e8lighttrim_b.tga\r
+       }\r
+       {\r
+               map $lightmap\r
+               blendfunc filter\r
+               tcGen lightmap\r
+       }\r
+}\r
+\r
+textures/e8/e8evilspacetxt\r
+{\r
+       surfaceparm nomarks\r
+       surfaceparm trans\r
+       surfaceparm pointlight\r
+       {\r
+               map textures/e8/e8evilspacetxt.tga\r
+               blendfunc add\r
+               rgbGen Vertex\r
+       }\r
+}\r
+\r
+textures/e8/e8beam_blue\r
+{\r
+       qer_editorimage textures/e8/e8beam_blue.tga\r
+       surfaceparm nolightmap\r
+       surfaceparm nomarks\r
+       surfaceparm nonsolid\r
+       surfaceparm trans\r
+       cull disable\r
+       qer_trans 0.6\r
+       {\r
+               map textures/e8/e8beam_blue.tga\r
+               blendfunc add\r
+               tcMod scroll 0.3 0\r
+       }\r
+}\r
+\r
+textures/e8/e8metal03c_shiney\r
+{\r
+       qer_editorimage textures/e8/e8metal03c.tga\r
+       {\r
+               map textures/effects/tinfx.tga\r
+               rgbGen identity\r
+               tcGen environment\r
+       }\r
+       {\r
+               map $lightmap\r
+               blendfunc gl_dst_color gl_one_minus_dst_alpha\r
+               rgbGen identity\r
+               tcGen lightmap\r
+       }\r
+}\r
+\r
+textures/e8/ctf_e8stars\r
+{\r
+       qer_editorimage textures/e8/e8stars.tga\r
+       surfaceparm noimpact\r
+       surfaceparm nolightmap\r
+       surfaceparm nomarks\r
+       q3map_surfacelight 10\r
+       q3map_sun 1 0.98 0.9 15 0 90\r
+       skyParms textures/e8/env/e8 - -\r
+}\r
+\r
+textures/e8/dm_e8stars\r
+{\r
+       qer_editorimage textures/e8/e8stars.tga\r
+       surfaceparm noimpact\r
+       surfaceparm nolightmap\r
+       surfaceparm nomarks\r
+       q3map_surfacelight 30\r
+       q3map_sun 1 0.98 0.9 55 0 90\r
+       skyParms textures/e8/env/e8 - -\r
+}\r
+\r
+textures/e8/dm_e8stars2\r
+{\r
+       qer_editorimage textures/e8/e8stars.tga\r
+       surfaceparm noimpact\r
+       surfaceparm nolightmap\r
+       surfaceparm nomarks\r
+       q3map_surfacelight 70\r
+       q3map_sun 1 0.98 0.9 100 0 90\r
+       skyParms textures/e8/env/e8 - -\r
+}\r
+\r
+textures/e8/e8metal_blue_shiney\r
+{\r
+       qer_editorimage textures/e8/e8metal_blue.tga\r
+       {\r
+               map textures/effects/tinfx.tga\r
+               rgbGen identity\r
+               tcGen environment\r
+       }\r
+       {\r
+               map $lightmap\r
+               blendfunc gl_dst_color gl_one_minus_dst_alpha\r
+               rgbGen identity\r
+               tcGen lightmap\r
+       }\r
+}\r
+\r
+textures/e8/e8metal_red_shiney\r
+{\r
+       qer_editorimage textures/e8/e8metal_red.tga\r
+       {\r
+               map textures/effects/tinfx.tga\r
+               rgbGen identity\r
+               tcGen environment\r
+       }\r
+       {\r
+               map $lightmap\r
+               blendfunc gl_dst_color gl_one_minus_dst_alpha\r
+               rgbGen identity\r
+               tcGen lightmap\r
+       }\r
+}\r

diff --git a/data/scripts/el3dm1.shader b/data/scripts/el3dm1.shader
deleted file mode 100644 (file)
index 4456a9f..0000000
--- a/data/scripts/el3dm1.shader
+++ /dev/null
@@ -1,385 +0,0 @@
-textures/e8/e8alphaspawn\r
-{\r
-       surfaceparm nomarks\r
-       surfaceparm trans\r
-       surfaceparm pointlight\r
-       {\r
-               map textures/e8/e8alphaspawn.tga\r
-               blendfunc add\r
-               rgbGen Vertex\r
-       }\r
-}\r
-\r
-textures/e8/e8yarrow\r
-{\r
-       surfaceparm nomarks\r
-       surfaceparm trans\r
-       surfaceparm pointlight\r
-       {\r
-               map textures/e8/e8yarrow.tga\r
-               blendfunc add\r
-               rgbGen Vertex\r
-       }\r
-}\r
-\r
-textures/e8/e8lightblue_flicker\r
-{\r
-       qer_editorimage textures/e8/e8tinylightblue.tga\r
-       surfaceparm nomarks\r
-       q3map_surfacelight 950\r
-       {\r
-               map textures/e8/e8tinylightblue.tga\r
-       }\r
-       {\r
-               map $lightmap\r
-               blendfunc filter\r
-               tcGen lightmap\r
-       }\r
-}\r
-\r
-//id shader modified..\r
-\r
-textures/e8/zap_e8\r
-{\r
-       qer_editorimage textures/sfx/zap_scroll.tga\r
-//q3map_surfacelight   300\r
-       surfaceparm     trans\r
-       surfaceparm nomarks\r
-       surfaceparm nolightmap\r
-       cull none\r
-       {\r
-               Map textures/sfx/zap_scroll.tga\r
-               blendFunc GL_ONE GL_ONE\r
-               rgbgen wave triangle .8 2 0 7\r
-               tcMod scroll 0 1\r
-       }\r
-       {\r
-               Map textures/sfx/zap_scroll.tga\r
-               blendFunc GL_ONE GL_ONE\r
-               rgbgen wave triangle 1 1.4 0 5\r
-               tcMod scale  -1 1\r
-               tcMod scroll 0 1\r
-       }\r
-       {\r
-               Map textures/sfx/zap_scroll2.tga\r
-               blendFunc GL_ONE GL_ONE\r
-               rgbgen wave triangle 1 1.4 0 6.3\r
-               tcMod scale  -1 1\r
-               tcMod scroll 2 1\r
-       }\r
-       {\r
-               Map textures/sfx/zap_scroll2.tga\r
-               blendFunc GL_ONE GL_ONE\r
-               rgbgen wave triangle 1 1.4 0 7.7\r
-               tcMod scroll -1.3 1\r
-       }\r
-}\r
-//end id shader modify\r
-\r
-textures/e8/e8lighttrim_static\r
-{\r
-       qer_editorimage textures/e8/e8lighttrim.tga\r
-       surfaceparm nomarks\r
-       q3map_surfacelight 400\r
-       {\r
-               map textures/e8/e8lighttrim.tga\r
-       }\r
-       {\r
-               map $lightmap\r
-               blendfunc filter\r
-               tcGen lightmap\r
-       }\r
-}\r
-\r
-textures/e8/e8lighttrim_glow\r
-{\r
-       qer_editorimage textures/e8/e8lighttrim.tga\r
-       surfaceparm nomarks\r
-       q3map_surfacelight 400\r
-       {\r
-               map textures/e8/e8lighttrim.tga\r
-       }\r
-       {\r
-               map $lightmap\r
-               blendfunc filter\r
-               tcGen lightmap\r
-       }\r
-}\r
-\r
-textures/e8/e8lighttrim_b_static\r
-{\r
-       qer_editorimage textures/e8/e8lighttrim_b.tga\r
-       surfaceparm nomarks\r
-       q3map_surfacelight 400\r
-       {\r
-               map textures/e8/e8lighttrim_b.tga\r
-       }\r
-       {\r
-               map $lightmap\r
-               blendfunc filter\r
-               tcGen lightmap\r
-       }\r
-       }\r
-\r
-textures/e8/e8lighttrim_b_glow\r
-{\r
-       qer_editorimage textures/e8/e8lighttrim_b.tga\r
-       surfaceparm nomarks\r
-       q3map_surfacelight 400\r
-       {\r
-               map textures/e8/e8lighttrim_b.tga\r
-       }\r
-       {\r
-               map $lightmap\r
-               blendfunc filter\r
-               tcGen lightmap\r
-       }\r
-}\r
-\r
-textures/e8/e8_launchpad1\r
-{\r
-       surfaceparm metalsteps\r
-       q3map_surfacelight 100\r
-       {\r
-               map textures/e8/e8_launchpad1_fx.tga\r
-               rgbGen identity\r
-               tcMod scroll 0 3\r
-       }\r
-       {\r
-               map textures/e8/e8_launchpad1.tga\r
-               blendfunc blend\r
-               rgbGen identity\r
-       }\r
-       {\r
-               map $lightmap\r
-               blendfunc gl_dst_color gl_one_minus_dst_alpha\r
-               rgbGen identity\r
-               tcGen lightmap\r
-       }\r
-}\r
-\r
-textures/e8/e8xgirder\r
-{\r
-       surfaceparm alphashadow\r
-       surfaceparm metalsteps\r
-       surfaceparm nomarks\r
-       surfaceparm trans\r
-       cull disable\r
-       nopicmip\r
-       {\r
-               map textures/e8/e8xgirder.tga\r
-               rgbGen identity\r
-               depthWrite\r
-               alphaFunc GE128\r
-       }\r
-       {\r
-               map $lightmap\r
-               blendfunc filter\r
-               rgbGen identity\r
-               tcGen lightmap\r
-               depthFunc equal\r
-       }\r
-}\r
-\r
-textures/e8/e8xgirder_small\r
-{\r
-       cull disable\r
-       {\r
-               map textures/e8/e8xgirder_small.tga\r
-               rgbGen identity\r
-               depthWrite\r
-               alphaFunc GE128\r
-       }\r
-       {\r
-               map $lightmap\r
-               blendfunc filter\r
-               rgbGen identity\r
-               tcGen lightmap\r
-               depthFunc equal\r
-       }\r
-}\r
-\r
-textures/e8/e8xgirder_small2\r
-{\r
-       cull disable\r
-       {\r
-               map textures/e8/e8xgirder_small2.tga\r
-               rgbGen identity\r
-               depthWrite\r
-               alphaFunc GE128\r
-       }\r
-       {\r
-               map $lightmap\r
-               blendfunc filter\r
-               rgbGen identity\r
-               tcGen lightmap\r
-               depthFunc equal\r
-       }\r
-}\r
-\r
-textures/e8/e8rail2\r
-{\r
-       surfaceparm alphashadow\r
-       cull disable\r
-       nomipmaps\r
-       {\r
-               map textures/e8/e8rail2.tga\r
-               rgbGen identity\r
-               depthWrite\r
-               alphaFunc GE128\r
-       }\r
-       {\r
-               map $lightmap\r
-               blendfunc filter\r
-               rgbGen identity\r
-               tcGen lightmap\r
-               depthFunc equal\r
-       }\r
-}\r
-\r
-textures/e8/e8evilspacetxt\r
-{\r
-       surfaceparm nomarks\r
-       surfaceparm trans\r
-       surfaceparm pointlight\r
-       {\r
-               map textures/e8/e8evilspacetxt.tga\r
-               blendfunc add\r
-               rgbGen Vertex\r
-       }\r
-}\r
-\r
-textures/e8/e8beam_blue\r
-{\r
-       qer_editorimage textures/e8/e8beam_blue.tga\r
-       surfaceparm nolightmap\r
-       surfaceparm nomarks\r
-       surfaceparm nonsolid\r
-       surfaceparm trans\r
-       cull disable\r
-       qer_trans 0.6\r
-       {\r
-               map textures/e8/e8beam_blue.tga\r
-               blendfunc add\r
-               tcMod scroll 0.3 0\r
-       }\r
-}\r
-\r
-textures/e8/e8metal03c_shiney\r
-{\r
-       qer_editorimage textures/e8/e8metal03c.tga\r
-       {\r
-               map textures/effects/tinfx.tga\r
-               rgbGen identity\r
-               tcGen environment\r
-       }\r
-       {\r
-               map $lightmap\r
-               blendfunc gl_dst_color gl_one_minus_dst_alpha\r
-               rgbGen identity\r
-               tcGen lightmap\r
-       }\r
-}\r
-\r
-textures/e8/ctf_e8stars\r
-{\r
-       qer_editorimage textures/e8/e8stars.tga\r
-       surfaceparm noimpact\r
-       surfaceparm nolightmap\r
-       surfaceparm nomarks\r
-       q3map_surfacelight 10\r
-       q3map_sun 1 0.98 0.9 15 0 90\r
-       skyParms textures/e8/env/e8 - -\r
-}\r
-\r
-textures/e8/dm_e8stars\r
-{\r
-       qer_editorimage textures/e8/e8stars.tga\r
-       surfaceparm noimpact\r
-       surfaceparm nolightmap\r
-       surfaceparm nomarks\r
-       q3map_surfacelight 30\r
-       q3map_sun 1 0.98 0.9 55 0 90\r
-       skyParms textures/e8/env/e8 - -\r
-}\r
-\r
-textures/e8/dm_e8stars2\r
-{\r
-       qer_editorimage textures/e8/e8stars.tga\r
-       surfaceparm noimpact\r
-       surfaceparm nolightmap\r
-       surfaceparm nomarks\r
-       q3map_surfacelight 70\r
-       q3map_sun 1 0.98 0.9 100 0 90\r
-       skyParms textures/e8/env/e8 - -\r
-}\r
-\r
-textures/e8/e8metal_blue_shiney\r
-{\r
-       qer_editorimage textures/e8/e8metal_blue.tga\r
-       {\r
-               map textures/effects/tinfx.tga\r
-               rgbGen identity\r
-               tcGen environment\r
-       }\r
-       {\r
-               map $lightmap\r
-               blendfunc gl_dst_color gl_one_minus_dst_alpha\r
-               rgbGen identity\r
-               tcGen lightmap\r
-       }\r
-}\r
-\r
-textures/e8/e8metal_red_shiney\r
-{\r
-       qer_editorimage textures/e8/e8metal_red.tga\r
-       {\r
-               map textures/effects/tinfx.tga\r
-               rgbGen identity\r
-               tcGen environment\r
-       }\r
-       {\r
-               map $lightmap\r
-               blendfunc gl_dst_color gl_one_minus_dst_alpha\r
-               rgbGen identity\r
-               tcGen lightmap\r
-       }\r
-}\r
-\r
-//broken shader D:\r
-\r
-textures/e8/e8trimlight\r
-{\r
-       q3map_lightimage textures/e8/e8trimlight_fx.tga\r
-       q3map_surfacelight 100\r
-       {\r
-               map $lightmap\r
-               rgbGen identity\r
-               tcGen lightmap\r
-       }\r
-       {\r
-               map textures/e8/e8trimlight.tga\r
-               blendfunc filter\r
-               rgbGen identity\r
-       }\r
-       {\r
-               map textures/e8/e8trimlight_fx.tga\r
-               blendfunc add\r
-               tcMod scroll -2 0\r
-       }\r
-}\r
-\r
-textures/e8/e8trimlight2\r
-{\r
-       qer_editorimage textures/e8/e8trimlight2.tga\r
-       surfaceparm nomarks\r
-       q3map_surfacelight 400\r
-       {\r
-               map textures/e8/e8trimlight2.tga\r
-       }\r
-       {\r
-               map $lightmap\r
-               blendfunc filter\r
-               tcGen lightmap\r
-       }\r
-}\r

diff --git a/data/scripts/shaderlist.txt b/data/scripts/shaderlist.txt
index 51ca259f04fcf1f8d6e8b8df4a5c71561ac9058a..6b542c334cb81037a7b81042d09641abcc2d5c91 100644 (file)
--- a/data/scripts/shaderlist.txt
+++ b/data/scripts/shaderlist.txt
@@ -7,8 +7,8 @@ desertfactory
 domination\r
 dsi\r
 e7\r
+e8\r
 egyptsoc\r
-el3dm1\r
 evil_basemetal\r
 evil_basewall\r
 evil_d_techwalls\r