From 1fda20e537b86aa78df20b2c9c735fd48663f398 Mon Sep 17 00:00:00 2001
From: Rudolf Polzer <divverent@xonotic.org>
Date: Wed, 29 Feb 2012 11:00:17 +0100
Subject: [PATCH] fix some shader naming bugs

---
 scripts/map_xoylent.shader   | 104 +++++++++++++++++++++++++++++++++++
 scripts/model_xoylent.shader | 104 -----------------------------------
 scripts/shader-audit.sh      |   4 +-
 3 files changed, 107 insertions(+), 105 deletions(-)
 delete mode 100755 scripts/model_xoylent.shader

diff --git a/scripts/map_xoylent.shader b/scripts/map_xoylent.shader
index 39ee4c7d..07d77b95 100755
--- a/scripts/map_xoylent.shader
+++ b/scripts/map_xoylent.shader
@@ -275,3 +275,107 @@ textures/map_xoylent/trak6_trim4_edit
 		blendfunc filter
 	}
 }
+models/map_xoylent/asteroid
+{
+	qer_editorimage models/map_xoylent/asteroid.tga
+	{
+		map models/map_xoylent/asteroid.tga
+	}
+}
+
+models/map_xoylent/asteroid_egg
+{
+	qer_editorimage models/map_xoylent/asteroid_egg.tga
+	surfaceparm nolightmap
+	{
+		map models/map_xoylent/asteroid_egg.tga
+	}
+}
+
+models/map_xoylent/asteroid_egg_sign
+{
+	qer_editorimage models/map_xoylent/asteroid_egg_sign.tga
+	surfaceparm nolightmap
+	{
+		map models/map_xoylent/asteroid_egg_sign.tga
+	}
+}
+
+models/map_xoylent/asteroids_skybox
+{
+	qer_editorimage models/map_xoylent/asteroids_skybox.tga
+	surfaceparm nolightmap
+	{
+		map models/map_xoylent/asteroids_skybox.tga
+	}
+}
+
+models/map_xoylent/lamp_light
+{
+	qer_editorimage models/map_xoylent/lamp_light.tga
+	q3map_surfacelight 2500
+	q3map_lightRGB 1 0.9375 0.875
+	{
+		map models/map_xoylent/lamp_light.tga
+	}
+}
+
+models/map_xoylent/lamp_small_light
+{
+	qer_editorimage models/map_xoylent/lamp_light.tga
+	q3map_surfacelight 500
+	q3map_lightRGB 1 0.9375 0.875
+	{
+		map models/map_xoylent/lamp_light.tga
+	}
+}
+
+models/map_xoylent/pathway
+{
+	qer_editorimage models/map_xoylent/pathway.tga
+	dpglossintensitymod 3
+	dpglossexponentmod 4
+	{
+		map models/map_xoylent/pathway.tga
+	}
+	{
+		map $lightmap
+		rgbGen identity
+		tcGen lightmap
+		blendfunc filter
+	}
+}
+
+models/map_xoylent/spawnpoint_light
+{
+	qer_editorimage models/map_xoylent/spawnpoint_light.tga
+	{
+		map models/map_xoylent/spawnpoint_light.tga
+		tcMod scroll 0.5 0
+	}
+}
+
+models/map_xoylent/spine
+{
+	qer_editorimage models/map_xoylent/spine.tga
+	dpglossintensitymod 3
+	dpglossexponentmod 4
+	{
+		map models/map_xoylent/spine.tga
+	}
+	{
+		map $lightmap
+		rgbGen identity
+		tcGen lightmap
+		blendfunc filter
+	}
+}
+
+models/map_xoylent/turbine_fan
+{
+	qer_editorimage models/map_xoylent/turbine_fan.tga
+	surfaceparm nolightmap
+	{
+		map models/map_xoylent/turbine_fan.tga
+	}
+}
diff --git a/scripts/model_xoylent.shader b/scripts/model_xoylent.shader
deleted file mode 100755
index bd61cb19..00000000
--- a/scripts/model_xoylent.shader
+++ /dev/null
@@ -1,104 +0,0 @@
-models/map_xoylent/asteroid
-{
-	qer_editorimage models/map_xoylent/asteroid.tga
-	{
-		map models/map_xoylent/asteroid.tga
-	}
-}
-
-models/map_xoylent/asteroid_egg
-{
-	qer_editorimage models/map_xoylent/asteroid_egg.tga
-	surfaceparm nolightmap
-	{
-		map models/map_xoylent/asteroid_egg.tga
-	}
-}
-
-models/map_xoylent/asteroid_egg_sign
-{
-	qer_editorimage models/map_xoylent/asteroid_egg_sign.tga
-	surfaceparm nolightmap
-	{
-		map models/map_xoylent/asteroid_egg_sign.tga
-	}
-}
-
-models/map_xoylent/asteroids_skybox
-{
-	qer_editorimage models/map_xoylent/asteroids_skybox.tga
-	surfaceparm nolightmap
-	{
-		map models/map_xoylent/asteroids_skybox.tga
-	}
-}
-
-models/map_xoylent/lamp_light
-{
-	qer_editorimage models/map_xoylent/lamp_light.tga
-	q3map_surfacelight 2500
-	q3map_lightRGB 1 0.9375 0.875
-	{
-		map models/map_xoylent/lamp_light.tga
-	}
-}
-
-models/map_xoylent/lamp_small_light
-{
-	qer_editorimage models/map_xoylent/lamp_light.tga
-	q3map_surfacelight 500
-	q3map_lightRGB 1 0.9375 0.875
-	{
-		map models/map_xoylent/lamp_light.tga
-	}
-}
-
-models/map_xoylent/pathway
-{
-	qer_editorimage models/map_xoylent/pathway.tga
-	dpglossintensitymod 3
-	dpglossexponentmod 4
-	{
-		map models/map_xoylent/pathway.tga
-	}
-	{
-		map $lightmap
-		rgbGen identity
-		tcGen lightmap
-		blendfunc filter
-	}
-}
-
-models/map_xoylent/spawnpoint_light
-{
-	qer_editorimage models/map_xoylent/spawnpoint_light.tga
-	{
-		map models/map_xoylent/spawnpoint_light.tga
-		tcMod scroll 0.5 0
-	}
-}
-
-models/map_xoylent/spine
-{
-	qer_editorimage models/map_xoylent/spine.tga
-	dpglossintensitymod 3
-	dpglossexponentmod 4
-	{
-		map models/map_xoylent/spine.tga
-	}
-	{
-		map $lightmap
-		rgbGen identity
-		tcGen lightmap
-		blendfunc filter
-	}
-}
-
-models/map_xoylent/turbine_fan
-{
-	qer_editorimage models/map_xoylent/turbine_fan.tga
-	surfaceparm nolightmap
-	{
-		map models/map_xoylent/turbine_fan.tga
-	}
-}
diff --git a/scripts/shader-audit.sh b/scripts/shader-audit.sh
index 80dd7d20..54018b95 100755
--- a/scripts/shader-audit.sh
+++ b/scripts/shader-audit.sh
@@ -211,7 +211,9 @@ use_texture()
 			suf=${1#*/map_}
 			map=${suf%%[_/]*}
 			case "$2" in
-				"$pre"/map_$map[/_]*)
+				textures/map_$map[/_]*)
+					;;
+				models/map_$map[/_]*)
 					;;
 				textures/map_*|models/map_*)
 					# protect one map's textures from the evil of other maps :P
-- 
2.39.2