From: Matthias Krüger <matthias.krueger@famsik.de>
Date: Sat, 8 Jun 2013 15:30:55 +0000 (+0200)
Subject: map: lightspeed: remove textures/map_lightspeed/light/light_1.tga and models/map_ligh... 
X-Git-Tag: xonotic-v0.8.0~41^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=35978ec8e8f8540307c2fd9d594652fa1a8c6be6;p=xonotic%2Fxonotic-maps.pk3dir.git

map: lightspeed: remove textures/map_lightspeed/light/light_1.tga and models/map_lightspeed/vines/vines01.tga and use
textures/ex2x/light/light_1.tga and models/desertfactory/textures/misc/vines01.tga since the files are the same.
---

diff --git a/maps/lightspeed.map.options b/maps/lightspeed.map.options
index d40f3823..6813573b 100644
--- a/maps/lightspeed.map.options
+++ b/maps/lightspeed.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -sRGB
-Version: 6
\ No newline at end of file
+Version: 7
diff --git a/models/map_lightspeed/vines.ase b/models/map_lightspeed/vines.ase
index 30b8307a..aeaf8143 100644
--- a/models/map_lightspeed/vines.ase
+++ b/models/map_lightspeed/vines.ase
@@ -42,7 +42,7 @@
 		}
 	}
 	*MATERIAL	2	{
-		*MATERIAL_NAME	"models/model_lightspeed/vines_long"
+		*MATERIAL_NAME	"models/desertfactory/textures/misc/vines01.tga"
 		*MATERIAL_CLASS	"Standard"
 		*MATERIAL_DIFFUSE	0.666268	1.000000	0.139158
 		*MATERIAL_SHADING Phong
diff --git a/models/map_lightspeed/vines/vines01.tga b/models/map_lightspeed/vines/vines01.tga
deleted file mode 100644
index 14903d57..00000000
Binary files a/models/map_lightspeed/vines/vines01.tga and /dev/null differ
diff --git a/scripts/map_lightspeed.shader b/scripts/map_lightspeed.shader
index 5688108b..dfa6dbf0 100644
--- 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,7 +76,7 @@ textures/map_lightspeed/light_nonglow
 
 textures/map_lightspeed/vines
 {
-	qer_editorimage models/map_lightspeed/vines/vines01.tga
+	qer_editorimage models/desertfactory/textures/misc/vines01.tga
 	surfaceparm nonsolid
 	surfaceparm nodlight
 	surfaceparm nolightmap
@@ -88,7 +88,7 @@ textures/map_lightspeed/vines
 	
 	
 	{
-		map models/map_lightspeed/vines/vines01.tga
+		map models/desertfactory/textures/misc/vines01.tga
 		blendfunc filter
 		alphaFunc GT0
 		rgbGen identity
diff --git a/scripts/model_lightspeed.shader b/scripts/model_lightspeed.shader
index 8ee73d1a..b4836053 100644
--- a/scripts/model_lightspeed.shader
+++ b/scripts/model_lightspeed.shader
@@ -1,13 +1,13 @@
 models/model_lightspeed/vines_long
 {
-	qer_editorimage models/map_lightspeed/vines/vines01.tga
+	qer_editorimage models/desertfactory/textures/misc/vines01.tga
 	surfaceparm nomarks
 	surfaceparm trans
 	surfaceparm alphashadow
 	deformVertexes wave 75 sin 0 2 0.1 0.1
 	cull none
 	{
-		map models/map_lightspeed/vines/vines01.tga
+		map models/desertfactory/textures/misc/vines01.tga
 		alphaFunc GT0
 		rgbGen vertex
 	
@@ -26,4 +26,4 @@ models/model_lightspeed/vines_leaves
 		alphaFunc GT0
 		rgbGen vertex
 	}
-}
\ No newline at end of file
+}
diff --git a/textures/map_lightspeed/light/light_1.tga b/textures/map_lightspeed/light/light_1.tga
deleted file mode 100644
index 19605270..00000000
Binary files a/textures/map_lightspeed/light/light_1.tga and /dev/null differ
diff --git a/textures/map_lightspeed/light/light_1_gloss.tga b/textures/map_lightspeed/light/light_1_gloss.tga
deleted file mode 100644
index dc8636c2..00000000
Binary files a/textures/map_lightspeed/light/light_1_gloss.tga and /dev/null differ
diff --git a/textures/map_lightspeed/light/light_1_norm.tga b/textures/map_lightspeed/light/light_1_norm.tga
deleted file mode 100644
index 5083dda2..00000000
Binary files a/textures/map_lightspeed/light/light_1_norm.tga and /dev/null differ