From 6234fa9cf27d231daca093eab5fd811ec6eb3b8d Mon Sep 17 00:00:00 2001
From: lordhavoc <lordhavoc@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Thu, 27 Apr 2006 11:32:13 +0000
Subject: [PATCH] fixed light texture in nexdm05

git-svn-id: svn://svn.icculus.org/nexuiz/trunk/data@1329 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 scripts/evil4_techtrims.shader                |  58 +++++++++++-------
 .../{mtl_l1_fx2.jpg => mtl_l1_glow.jpg}       | Bin
 2 files changed, 36 insertions(+), 22 deletions(-)
 rename textures/evil4_lights/{mtl_l1_fx2.jpg => mtl_l1_glow.jpg} (100%)

diff --git a/scripts/evil4_techtrims.shader b/scripts/evil4_techtrims.shader
index 3d1f4340a..cfc98ca00 100644
--- a/scripts/evil4_techtrims.shader
+++ b/scripts/evil4_techtrims.shader
@@ -523,35 +523,49 @@ textures/evil4_lights/mtl_l1
 {
 	q3map_surfacelight 1000
 	q3map_lightimage textures/evil4_lights/mtl_l1.tga
-	{
-		map textures/evil4_lights/mtl_l1_fx.tga
-		//blendfunc add
-		tcmod scale 12 1
-		rgbGen identity
-		tcMod scroll 0 1
-	}
-	{
-		map textures/evil4_lights/mtl_l1_fx.tga
-		blendfunc add
-		//tcmod scale 25 1
-		rgbGen identity
-		tcMod scroll 1 0
-	}
+	// LordHavoc: replaced most of this shader
 	{
 		map textures/evil4_lights/mtl_l1.tga
-		blendfunc blend
-		rgbGen identity
-	}
-	{
-		map textures/evil4_lights/mtl_l1_fx2.tga
-		blendfunc add
-		tcmod scale 1 1
 	}
 	{
 		map $lightmap
 		rgbGen identity
 		blendfunc filter
 	}
+	{
+		map textures/evil4_lights/mtl_l1_glow.tga
+		blendfunc add
+	}
+	// LordHavoc: original shader
+	//{
+	//	map textures/evil4_lights/mtl_l1_fx.tga
+	//	//blendfunc add
+	//	tcmod scale 12 1
+	//	rgbGen identity
+	//	tcMod scroll 0 1
+	//}
+	//{
+	//	map textures/evil4_lights/mtl_l1_fx.tga
+	//	blendfunc add
+	//	//tcmod scale 25 1
+	//	rgbGen identity
+	//	tcMod scroll 1 0
+	//}
+	//{
+	//	map textures/evil4_lights/mtl_l1.tga
+	//	blendfunc blend
+	//	rgbGen identity
+	//}
+	//{
+	//	map textures/evil4_lights/mtl_l1_glow.tga
+	//	blendfunc add
+	//	tcmod scale 1 1
+	//}
+	//{
+	//	map $lightmap
+	//	rgbGen identity
+	//	blendfunc filter
+	//}
 }
 
 //border light
@@ -1264,4 +1278,4 @@ textures/evil4_d_techwalls/d_drkmtl_dpanelwrnb2
 		blendFunc GL_DST_COLOR GL_ONE_MINUS_DST_ALPHA
 		rgbGen identity
 	}
-}
\ No newline at end of file
+}
diff --git a/textures/evil4_lights/mtl_l1_fx2.jpg b/textures/evil4_lights/mtl_l1_glow.jpg
similarity index 100%
rename from textures/evil4_lights/mtl_l1_fx2.jpg
rename to textures/evil4_lights/mtl_l1_glow.jpg
-- 
2.39.2