map: solarium: remove textures/map_solarium/waterfall/water2.tga and use textures...
authorMatthias Krüger <matthias.krueger@famsik.de>
Sat, 8 Jun 2013 15:32:48 +0000 (17:32 +0200)
committerMatthias Krüger <matthias.krueger@famsik.de>
Sat, 8 Jun 2013 15:32:48 +0000 (17:32 +0200)
since the files are the same.

maps/solarium.map.options
scripts/map_solarium.shader
textures/map_solarium/waterfall/water2.tga [deleted file]
textures/map_solarium/waterfall/water2_norm.tga [deleted file]

index 7acca23..1e60fc0 100644 (file)
@@ -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
index a498374..107730c 100644 (file)
@@ -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