map: lightspeed: remove textures/map_lightspeed/light/light_1.tga and models/map_ligh...

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 d40f3823f2791aa5fed9f3cd96e0824e761686c6..6813573bab9d2df12d3e7b93bd04097f97592cf4 100644 (file)
--- 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 30b8307ac283729159f1cab206da224226e26553..aeaf81439d55141b002649d9116e060ca17884f8 100644 (file)
--- a/models/map_lightspeed/vines.ase
+++ b/models/map_lightspeed/vines.ase
@@ -42,7 +42,7 @@
                }\r
        }\r
        *MATERIAL       2       {\r
-               *MATERIAL_NAME  "models/model_lightspeed/vines_long"\r
+               *MATERIAL_NAME  "models/desertfactory/textures/misc/vines01.tga"\r
                *MATERIAL_CLASS "Standard"\r
                *MATERIAL_DIFFUSE       0.666268        1.000000        0.139158\r
                *MATERIAL_SHADING Phong\r

diff --git a/models/map_lightspeed/vines/vines01.tga b/models/map_lightspeed/vines/vines01.tga
deleted file mode 100644 (file)
index 14903d5..0000000
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 5688108b6c8af0ed68ae2a36e46e8594b459248f..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,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 8ee73d1abdb893b4cc7f9d177d813249afc8f6ed..b4836053a356b57b5f54df2a5783b5de15ad34ad 100644 (file)
--- 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 (file)
index 1960527..0000000
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 (file)
index dc8636c..0000000
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 (file)
index 5083dda..0000000
Binary files a/textures/map_lightspeed/light/light_1_norm.tga and /dev/null differ