X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=scripts%2Fshader-audit.sh;h=976f57e831cd96a59c8c26853d143b0af1d77d8a;hb=33ceb5d06f5d69463b314d3b4aac30edaab0e7eb;hp=f7c0b95a4af02708cb12bac8a827726395c0f3b1;hpb=ed872c82e969d670a26545b9caf995758767f97b;p=xonotic%2Fxonotic-maps.pk3dir.git

diff --git a/scripts/shader-audit.sh b/scripts/shader-audit.sh
index f7c0b95a..976f57e8 100644
--- a/scripts/shader-audit.sh
+++ b/scripts/shader-audit.sh
@@ -80,7 +80,7 @@ use_texture()
 
 	# verify shader -> texture name
 	case "$1" in
-		## RULE: textures/FOOx/BAR-BAZ must use textures/FOO/*/*, recommended textures/FOO/BAR/BAZ
+		## RULE: textures/FOOx/BAR-BAZ must use textures/FOOx/*/*, recommended textures/FOOx/BAR/BAZ
 		textures/*x/*-*)
 			pre=${1%%x/*}x
 			suf=${1#*x/}
@@ -93,7 +93,7 @@ use_texture()
 					;;
 			esac
 			;;
-		## RULE: textures/FOOx/BAR must use textures/FOO/*/*, recommended textures/FOO/base/BAR
+		## RULE: textures/FOOx/BAR must use textures/FOOx/*/*, recommended textures/FOOx/base/BAR
 		textures/*x/*)
 			pre=${1%%x/*}x
 			suf=${1#*x/}
@@ -113,9 +113,13 @@ use_texture()
 			case "$2" in
 				"$pre"/map_$map[/_]*)
 					;;
-				*)
+				textures/map_*)
+					# protect one map's textures from the evil of other maps :P
 					echo "(EE) texture $2 of shader $1 is out of place, recommended file name is $pre/map_$map/*"
 					;;
+				*)
+					# using outside stuff is permitted
+					;;
 			esac
 			;;
 		## RULE: textures/common/FOO must use textures/common/FOO or textures/common/*/*