Merge branch 'master' into matthiaskrgr/hudsetup

[xonotic/xonotic-maps.pk3dir.git] / scripts / map_lightspeed.shader

diff --git a/scripts/map_lightspeed.shader b/scripts/map_lightspeed.shader
index e82fef16d3ee1958282dcef93e375aa403c20191..dfa6dbf08a98ba07d774e626f7b40669549d471f 100644 (file)
--- a/scripts/map_lightspeed.shader
+++ b/scripts/map_lightspeed.shader
@@ -53,7 +53,7 @@ models/map_lightspeed/lcd_map
 
 textures/map_lightspeed/light_nonglow
 {
-       qer_editorimage textures/map_lightspeed/light/light_1.tga
+       qer_editorimage textures/ex2x/light/light_1.tga
        
        q3map_bounceScale  0.75
        dpoffsetmapping - 0.5
@@ -62,7 +62,7 @@ textures/map_lightspeed/light_nonglow
 
 
        {
-               map textures/map_lightspeed/light/light_1.tga
+               map textures/ex2x/light/light_1.tga
                
 
        }
@@ -76,15 +76,22 @@ textures/map_lightspeed/light_nonglow
 
 textures/map_lightspeed/vines
 {
-       qer_editorimage models/map_lightspeed/vines/vines01.tga
-       surfaceparm nomarks
-       surfaceparm trans
-       surfaceparm alphashadow
+       qer_editorimage models/desertfactory/textures/misc/vines01.tga
+       surfaceparm nonsolid
+       surfaceparm nodlight
+       surfaceparm nolightmap
+
+       polygonOffset
+       sort 6
        cull none
+       
+       
+       
        {
-               map models/map_lightspeed/vines/vines01.tga
+               map models/desertfactory/textures/misc/vines01.tga
+               blendfunc filter
                alphaFunc GT0
-               rgbGen vertex
+               rgbGen identity
        }
 }