X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=scripts%2Fmap_lightspeed.shader;h=dfa6dbf08a98ba07d774e626f7b40669549d471f;hb=2f3e233d55f9e5950a6fe1032ea5bb23987233dd;hp=7565ff728db99a007a467d9ee196d347e40cc29f;hpb=b22da6fae94b0574eb7516a3c5bc98b0684ecffc;p=xonotic%2Fxonotic-maps.pk3dir.git

diff --git a/scripts/map_lightspeed.shader b/scripts/map_lightspeed.shader
index 7565ff72..dfa6dbf0 100644
--- a/scripts/map_lightspeed.shader
+++ b/scripts/map_lightspeed.shader
@@ -4,8 +4,8 @@ textures/map_lightspeed/lightspeedscrn
 
 	surfaceparm trans
 	surfaceparm nonsolid
-	surfaceparm nodlight
-	surfaceparm nolightmap
+//	surfaceparm nodlight
+//	surfaceparm nolightmap
 	qer_trans 0.6
 	
 	polygonOffset
@@ -14,8 +14,8 @@ textures/map_lightspeed/lightspeedscrn
 
 	{
 		map textures/map_lightspeed/screens/lightspeedscrn.tga
-		rgbgen identity
-		blendfunc add
+//		rgbgen identity
+		blendfunc blend
 		tcMod scroll 0 -0.25
 	}
 }
@@ -23,15 +23,15 @@ textures/map_lightspeed/lightspeedscrn
 textures/map_lightspeed/lightspeedscrn_t
 {
 	qer_editorimage textures/map_lightspeed/screens/lightspeedscrn1.tga
-	surfaceparm nolightmap
-	surfaceparm nodlight
+//	surfaceparm nolightmap
+//	surfaceparm nodlight
 	surfaceparm trans
 	cull none
 	qer_trans 0.6
 	
 	{
 		animMap 18 textures/map_lightspeed/screens/lightspeedscrn1.tga textures/map_lightspeed/screens/lightspeedscrn2.tga textures/map_lightspeed/screens/lightspeedscrn3.tga textures/map_lightspeed/screens/lightspeedscrn4.tga textures/map_lightspeed/screens/lightspeedscrn5.tga textures/map_lightspeed/screens/lightspeedscrn4.tga textures/map_lightspeed/screens/lightspeedscrn3.tga textures/map_lightspeed/screens/lightspeedscrn2.tga
-		blendfunc add
+		blendfunc blend
 	}
 }
 
@@ -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
 	}
 }