map: solarium: remove textures/map_solarium/waterfall/water2.tga and use textures...

since the files are the same.

diff --git a/maps/solarium.map.options b/maps/solarium.map.options
index 7acca23e087d1acaa52a264be62573b47c676b52..1e60fc0d0008c4c0678e8f5556f3cf49219c5227 100644 (file)
--- a/maps/solarium.map.options
+++ b/maps/solarium.map.options
@@ -2,4 +2,4 @@
 -vis +
 -light + -bounce 1 -dirty -dirtscale 1 -bouncescale 1 -areascale 0.10
 -minimap +
-Version: 4.1
\ No newline at end of file
+Version: 5

diff --git a/scripts/map_solarium.shader b/scripts/map_solarium.shader
index a498374be72fe188ecaff620efbc21ed6b310d4f..107730c869affc254a7df0bd3bb029104b416f92 100644 (file)
--- a/scripts/map_solarium.shader
+++ b/scripts/map_solarium.shader
@@ -1,12 +1,12 @@
 textures/map_solarium/waterfall
 {
-       qer_editorimage textures/map_solarium/waterfall/water2.tga
+       qer_editorimage textures/liquids_water/water2.tga
        qer_trans 20
        cull disable
        surfaceparm trans
 
        {
-               map textures/map_solarium/waterfall/water2.tga  
+               map textures/liquids_water/water2.tga
                tcMod scroll 0 -1.9
                blendfunc blend
        

diff --git a/textures/map_solarium/waterfall/water2.tga b/textures/map_solarium/waterfall/water2.tga
deleted file mode 100644 (file)
index 233e397..0000000
Binary files a/textures/map_solarium/waterfall/water2.tga and /dev/null differ

diff --git a/textures/map_solarium/waterfall/water2_norm.tga b/textures/map_solarium/waterfall/water2_norm.tga
deleted file mode 100644 (file)
index fb4fb22..0000000
Binary files a/textures/map_solarium/waterfall/water2_norm.tga and /dev/null differ