Fix catharsis and crystals shader (make them conform to shader-audit conventions)

diff --git a/scripts/crystals.shader b/scripts/crystals.shader
deleted file mode 100644 (file)
index 1401580..0000000
--- a/scripts/crystals.shader
+++ /dev/null
@@ -1,13 +0,0 @@
-models/crystals/crystal1
-{
-       dpglossintensitymod 5
-       dpglossexponentmod 2
-       dpreflectcube cubemaps/default/sky
-       {
-               map "models/crystals/crystal1"
-       }
-       {
-               map $lightmap
-       }
-}
-

diff --git a/scripts/map_catharsis.shader b/scripts/map_catharsis.shader
index a1d5b186734027a54739b5f6fbb395029d8865e0..f05f609bcab225287a8353f550fc4cf979cf2784 100644 (file)
--- 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/model_crystals.shader b/scripts/model_crystals.shader
new file mode 100644 (file)
index 0000000..1401580
--- /dev/null
+++ b/scripts/model_crystals.shader
@@ -0,0 +1,13 @@
+models/crystals/crystal1
+{
+       dpglossintensitymod 5
+       dpglossexponentmod 2
+       dpreflectcube cubemaps/default/sky
+       {
+               map "models/crystals/crystal1"
+       }
+       {
+               map $lightmap
+       }
+}
+