From: Rudolf Polzer <divVerent@xonotic.org>
Date: Thu, 16 Dec 2010 09:28:30 +0000 (+0100)
Subject: fix some text
X-Git-Tag: xonotic-v0.1.0preview~13
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=30d3483a491786a5e565825c94019831d2444c37;p=xonotic%2Fxonotic.git

fix some text
---

diff --git a/misc/infrastructure/keygen/response.d0ir b/misc/infrastructure/keygen/response.d0ir
index fe65eb8b..b09478d7 100755
--- a/misc/infrastructure/keygen/response.d0ir
+++ b/misc/infrastructure/keygen/response.d0ir
@@ -162,7 +162,7 @@ if((my $key = $cgi->param('key')))
 			or die "cannot start crypto-keygen-standalone";
 		my $err = <$errfh>;
 		close $errfh
-			or die "xonotic-keygen failed: $err";
+			or die "crypto-keygen-standalone failed: $err";
 		1;
 	}
 	or do
@@ -194,11 +194,11 @@ Content-type: text/html
 	</ol>
 	To generate and sign a key MANUALLY, follow these steps on a UNIX command line:
 	<ol>
-		<li>./xonotic-keygen -p key_$default_ca.d0pk -o key_$default_ca.d0si</li>
-		<li>./xonotic-keygen -p key_$default_ca.d0pk -I key_$default_ca.d0si -o request.d0iq -O camouflage.d0ic
+		<li>./crypto-keygen-standalone -p key_$default_ca.d0pk -o key_$default_ca.d0si</li>
+		<li>./crypto-keygen-standalone -p key_$default_ca.d0pk -I key_$default_ca.d0si -o request.d0iq -O camouflage.d0ic
 		<li>Upload the request.d0iq file: <input type="file" name="key"><input type="submit"></li>
 		<li>Save the response.d0ir file you are getting</li>
-		<li>./xonotic-keygen -p key_$default_ca.d0pk -I key_$default_ca.d0si -c camouflage.d0ic -J response.d0ir -o key_$default_ca.d0si</li>
+		<li>./crypto-keygen-standalone -p key_$default_ca.d0pk -I key_$default_ca.d0si -c camouflage.d0ic -J response.d0ir -o key_$default_ca.d0si</li>
 		<li>Delete request.d0iq, camouflage.d0ic, response.d0ir</li>
 	</ol>
 	Your key_$default_ca.d0si key is now signed.
diff --git a/misc/tools/compress-texture b/misc/tools/compress-texture
index 93d5c494..efacb863 100755
--- a/misc/tools/compress-texture
+++ b/misc/tools/compress-texture
@@ -16,6 +16,17 @@ f=
 fourcchack=
 case "$tool" in
 	compressonator-dxtc)
+		# we still have to preprocess the image to premultiply alpha, as it seems
+		case "$format" in
+			dxt2)
+				fourcchack=DXT2
+				format=dxt2
+				;;
+			dxt4)
+				fourcchack=DXT4
+				format=dxt4
+				;;
+		esac
 		;;
 	*)
 		case "$format" in