From c77e2066e7b8196fe04b2f8585fd0bac8d0c7098 Mon Sep 17 00:00:00 2001
From: Rudolf Polzer <divVerent@xonotic.org>
Date: Thu, 14 Jan 2016 23:05:02 +0100
Subject: [PATCH] Fix catharsis and crystals shader (make them conform to
 shader-audit conventions)

---
 scripts/map_catharsis.shader                  | 64 -------------------
 ...{crystals.shader => model_crystals.shader} |  0
 2 files changed, 64 deletions(-)
 rename scripts/{crystals.shader => model_crystals.shader} (100%)

diff --git a/scripts/map_catharsis.shader b/scripts/map_catharsis.shader
index a1d5b186..f05f609b 100644
--- a/scripts/map_catharsis.shader
+++ b/scripts/map_catharsis.shader
@@ -162,46 +162,6 @@ textures/map_catharsis/50_armor
 	}
 	
 }
-textures/map_catharsis/dirt1
-{
-	qer_editorimage textures/map_catharsis/dirt1.tga
-
-	surfaceparm trans
-	surfaceparm nonsolid
-	surfaceparm nodlight
-	surfaceparm nolightmap
-
-	polygonOffset
-	sort 6
-	cull none
-
-
-	{
-		map textures/map_catharsis/dirt1.tga
-		blendFunc filter
-		rgbgen identity
-	}
-}
-textures/map_catharsis/dirt2
-{
-	qer_editorimage textures/map_catharsis/dirt2
-
-	surfaceparm trans
-	surfaceparm nonsolid
-	surfaceparm nodlight
-	surfaceparm nolightmap
-
-	polygonOffset
-	sort 6
-	cull none
-
-
-	{
-		map textures/map_catharsis/dirt2
-		blendFunc filter
-		rgbgen identity
-	}
-}
 textures/map_catharsis/red
 {
 	qer_editorimage textures/map_catharsis/red.tga
@@ -243,27 +203,3 @@ textures/map_catharsis/red-surfacelight
 		blendfunc filter
 	}
 }
-justinterrain
-          {
-                  q3map_nonplanar
-                  q3map_shadeangle 65
-                  q3map_lightmapSampleOffset 3
-                  q3map_lightmapSampleSize 64
-                  q3map_globalTexture
-     qer_editorimage textures/map_catharsis/rock.tga
-                  dpnoshadow
-  {
-    map textures/map_catharsis/rock.tga
-  }
-      {
-         map textures/map_catharsis/sand.tga
-                          blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
-                          alphagen vertex
-      }
-           
-                  {
-                          map $lightmap
-                          blendfunc GL_DST_COLOR GL_ZERO
-                          rgbGen identity
-                  }
-}
\ No newline at end of file
diff --git a/scripts/crystals.shader b/scripts/model_crystals.shader
similarity index 100%
rename from scripts/crystals.shader
rename to scripts/model_crystals.shader
-- 
2.39.2