X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=misc%2Ftools%2Fcached-converter.sh;h=72f427c71d89bf150ac23dd4a4a40ba36431c74f;hp=1e6c0eb9bd395ae8e4c597aa06135fecfba947dc;hb=2ebe7a33ca4fd24d8bcf0010a9af41e167f34c3e;hpb=68334b70fb0380249ca1aaade8b0be903d55fb11

diff --git a/misc/tools/cached-converter.sh b/misc/tools/cached-converter.sh
index 1e6c0eb9..72f427c7 100755
--- a/misc/tools/cached-converter.sh
+++ b/misc/tools/cached-converter.sh
@@ -105,8 +105,10 @@ reduce_ogg_ogg()
 {
 	i=$1; shift; shift
 	o=$1; shift; shift
+	tags=`vorbiscomment -R -l "$i"`
 	oggdec -o "$tmpdir/x.wav" "$i" && \
 	oggenc -q"$1" -o "$o" "$tmpdir/x.wav"
+	echo "$tags" | vorbiscomment -R -w "$o"
 }
 
 reduce_wav_ogg()
@@ -129,8 +131,8 @@ reduce_rgba_jpeg2()
 	i=$1; shift; shift
 	o=$1; shift
 	oa=$1; shift
-	convert "$i" -alpha extract -quality 100 "$o" && \
-	convert "$i" -alpha off     -quality 100 "$oa" && \
+	convert "$i" -alpha off     -quality 100 "$o" && \
+	convert "$i" -alpha extract -quality 100 "$oa" && \
 	jpegoptim --strip-all -m"$1" "$o" && \
 	jpegoptim --strip-all -m"$2" "$oa"
 }
@@ -175,9 +177,10 @@ for F in "$@"; do
 	will_jpeg=$do_jpeg
 	will_dds=$do_dds
 	case "$f" in
+		*_bump) will_dds=false ;;
+		./models/player/*) will_dds=false ;;
 		./textures/*) ;;
 		./models/*) ;;
-		./maps/*/*) ;;
 		./particles/*) ;;
 		./progs/*) ;;
 		*)
@@ -245,7 +248,7 @@ for F in "$@"; do
 	if [ -f "dds/${f}.dds" ]; then
 		if [ -z "${f##./textures/*}" ]; then
 			if [ -n "${f##./textures/*/*}" ]; then
-				ln -snf "textures/${f%./textures/}.dds" "dds/${f%./textures/}.dds"
+				ln -snf "textures/${f#./textures/}.dds" "dds/${f#./textures/}.dds"
 			fi
 		fi
 	fi