From: Rudolf Polzer <divverent@xonotic.org>
Date: Thu, 30 Jun 2011 18:39:09 +0000 (+0200)
Subject: don't ogg talk.wav, talk2.wav
X-Git-Tag: xonotic-v0.5.0~65
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b48e0f4daddf698dea7f53390b7eb5686c77617f;p=xonotic%2Fxonotic.git

don't ogg talk.wav, talk2.wav
---

diff --git a/misc/tools/cached-converter.sh b/misc/tools/cached-converter.sh
index 104b657d..1a1ae07b 100755
--- a/misc/tools/cached-converter.sh
+++ b/misc/tools/cached-converter.sh
@@ -288,7 +288,9 @@ for F in "$@"; do
 
 	will_jpeg=$do_jpeg
 	will_dds=$do_dds
+	will_ogg=$do_ogg
 	case "$f" in
+		./sounds/misc/talk*.wav) will_ogg=false ;; # engine "feature"
 		*_bump) will_dds=false ;;
 		./models/player/*) will_dds=false ;;
 		./models/sprites/*) will_dds=false ;;
@@ -365,13 +367,13 @@ for F in "$@"; do
 			rm -f "$F.hasalpha"
 			;;
 		*.ogg)
-			cached "$do_ogg" reduce_ogg_ogg "$F" "" "$F" "" "$ogg_qual"
+			cached "$will_ogg" reduce_ogg_ogg "$F" "" "$F" "" "$ogg_qual"
 			;;
 		./sound/misc/null.wav)
 			# never convert this one
 			;;
 		*.wav)
-			cached "$do_ogg" reduce_wav_ogg "$F" "" "${f}.ogg" "" "$ogg_qual"
+			cached "$will_ogg" reduce_wav_ogg "$F" "" "${f}.ogg" "" "$ogg_qual"
 			;;
 	esac
 	selfprofile marktodelete