From: Rudolf Polzer <divVerent@alientrap.org>
Date: Fri, 6 Aug 2010 04:30:26 +0000 (+0200)
Subject: more bugfixes...
X-Git-Tag: xonotic-v0.1.0preview~327^2~2
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=01e631a5e946740d7a90378f2b0facf2ad985ad5

more bugfixes...
---

diff --git a/all b/all
index 1cb555a4..73b1e045 100755
--- a/all
+++ b/all
@@ -1005,6 +1005,9 @@ case "$cmd" in
 		# texture: convert to jpeg and dds
 		# music: reduce bitrate
 		export do_jpeg=false
+		export do_jpeg_if_not_dds=true
+		export jpeg_qual_rgb=80
+		export jpeg_qual_a=95
 		export do_dds=true
 		export dds_flags=
 		export do_ogg=true
@@ -1105,6 +1108,7 @@ case "$cmd" in
 		esac
 		;;
 	release-zip)
+		stamp=`cat Xonotic/stamp.txt`
 		zip -9r Xonotic-common.zip \
 			Xonotic/*.dll \
 			Xonotic/darkplaces-src \
@@ -1115,31 +1119,31 @@ case "$cmd" in
 			Xonotic/server \
 			Xonotic/*.app \
 			Xonotic/xonotic-* \
-			Xonotic/data/font-nimbussansl.pk3
+			Xonotic/data/font-nimbussansl-$stamp.pk3
 		cp Xonotic-common.zip Xonotic.zip
 		zip -0r Xonotic.zip \
-			Xonotic/data/xonotic-data.pk3 \
-			Xonotic/data/xonotic-maps.pk3 \
-			Xonotic/data/xonotic-music.pk3 \
-			Xonotic/data/xonotic-nexcompat.pk3
+			Xonotic/data/xonotic-$stamp-data.pk3 \
+			Xonotic/data/xonotic-$stamp-maps.pk3 \
+			Xonotic/data/xonotic-$stamp-music.pk3 \
+			Xonotic/data/xonotic-$stamp-nexcompat.pk3
 		cp Xonotic-common.zip Xonotic-low.zip
 		zip -0r Xonotic-low.zip \
-			Xonotic/data/xonotic-data-low.pk3 \
-			Xonotic/data/xonotic-maps-low.pk3 \
-			Xonotic/data/xonotic-music-low.pk3 \
-			Xonotic/data/xonotic-nexcompat.pk3
+			Xonotic/data/xonotic-$stamp-data-low.pk3 \
+			Xonotic/data/xonotic-$stamp-maps-low.pk3 \
+			Xonotic/data/xonotic-$stamp-music-low.pk3 \
+			Xonotic/data/xonotic-$stamp-nexcompat.pk3
 		cp Xonotic-common.zip Xonotic-lowdds.zip
 		zip -0r Xonotic-lowdds.zip \
-			Xonotic/data/xonotic-data-lowdds.pk3 \
-			Xonotic/data/xonotic-maps-lowdds.pk3 \
-			Xonotic/data/xonotic-music-low.pk3 \
-			Xonotic/data/xonotic-nexcompat.pk3
+			Xonotic/data/xonotic-$stamp-data-lowdds.pk3 \
+			Xonotic/data/xonotic-$stamp-maps-lowdds.pk3 \
+			Xonotic/data/xonotic-$stamp-music-low.pk3 \
+			Xonotic/data/xonotic-$stamp-nexcompat.pk3
 		cp Xonotic-common.zip Xonotic-high.zip
 		zip -0r Xonotic-high.zip \
-			Xonotic/data/xonotic-data-raw.pk3 \
-			Xonotic/data/xonotic-maps-raw.pk3 \
-			Xonotic/data/xonotic-music.pk3 \
-			Xonotic/data/xonotic-nexcompat.pk3
+			Xonotic/data/xonotic-$stamp-data-raw.pk3 \
+			Xonotic/data/xonotic-$stamp-maps-raw.pk3 \
+			Xonotic/data/xonotic-$stamp-music.pk3 \
+			Xonotic/data/xonotic-$stamp-nexcompat.pk3
 		rm -f Xonotic-common.zip
 		;;
 	release)
diff --git a/misc/tools/cached-converter.sh b/misc/tools/cached-converter.sh
index df819115..6d6b7684 100755
--- a/misc/tools/cached-converter.sh
+++ b/misc/tools/cached-converter.sh
@@ -4,6 +4,7 @@ set -e
 
 : ${CACHEDIR:=$HOME/.xonotic-cached-converter}
 : ${do_jpeg:=true}
+: ${do_jpeg_if_not_dds:=false}
 : ${jpeg_qual_rgb:=95}
 : ${jpeg_qual_a:=99}
 : ${do_dds:=true}
@@ -182,6 +183,14 @@ for F in "$@"; do
 			;;
 	esac
 
+	if $do_jpeg_if_not_dds; then
+		if $will_dds; then
+			will_jpeg=false
+		else
+			will_jpeg=true
+		fi
+	fi
+
 	case "$F" in
 		*_alpha.jpg)
 			# handle in *.jpg case