From: Rudolf Polzer <divverent@xonotic.org>
Date: Thu, 14 Jan 2016 02:47:34 +0000 (+0100)
Subject: minor fixes
X-Git-Tag: xonotic-v0.8.2~151
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cc5f26448eb348ea72ea94ecfeacbe472c92f850;p=xonotic%2Fxonotic-maps.pk3dir.git

minor fixes
---

diff --git a/scripts/shader-audit.sh b/scripts/shader-audit.sh
index c583f0ee..8aab433e 100755
--- a/scripts/shader-audit.sh
+++ b/scripts/shader-audit.sh
@@ -342,17 +342,18 @@ parse_shaderstage_post()
 			mainalphagen=$ss_alphagen
 		elif [ x"$ss_alphagen" = x"vertex" ] && ! $textureblending; then
 			case "$mainblendfunc:$mainalphafunc:$ss_blendfunc:$ss_alphafunc" in
+				# TODO check against dp
 				none:none:"gl_src_alpha gl_one_minus_src_alpha":none) textureblending=true ;;
 				none:none:filter:none) textureblending=true ;;
 				none:none:none:g*) textureblending=true ;;
 				"gl_one gl_zero":none:filter:none) textureblending=true ;;
 				"gl_one gl_zero":none:none:g*) textureblending=true ;;
 				*)
-					err "texture blending requires first stage to have no blendfunc/alphatest, and requires second stage to be blendfunc filter"
+					err "$parsing_shader uses texture blending, but that requires first stage to have no blendfunc/alphatest, and requires second stage to be blendfunc filter"
 					;;
 			esac
 		else
-			err "multistage shader without alphagen vertex, or using more than 2 stages, is not supported by DarkPlaces"
+			err "$parsing_shader, a multistage shader without alphagen vertex, or using more than 2 stages, is not supported by DarkPlaces"
 		fi
 	fi
 }
diff --git a/scripts/shader-parser.subr b/scripts/shader-parser.subr
index ef82832f..5f18cec8 100644
--- a/scripts/shader-parser.subr
+++ b/scripts/shader-parser.subr
@@ -4,7 +4,7 @@
 
 shader_normalize()
 {
-	echo "$1" | sed 's/\.\(tga\|jpg\|png\)$//'
+	echo "$1" | sed 's/^"//; s/"$//; s/\.\(tga\|jpg\|png\)$//'
 }
 
 parse_shaderstage_pre()