X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=misc%2Ftools%2Fdemopacker.sh;h=9b424226314de33f4f480955c86997d8867f94e5;hp=00c5d1444282f7f77b8b9b8c84140aab1705edee;hb=HEAD;hpb=616e733b8a2ce56b912b436cf2f9b3512574cec3

diff --git a/misc/tools/demopacker.sh b/misc/tools/demopacker.sh
index 00c5d144..9b424226 100755
--- a/misc/tools/demopacker.sh
+++ b/misc/tools/demopacker.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 
 xonotic=$1; shift
-strip=$1; shift
 demo=$1; shift
 # rest: command line options to use
 
@@ -9,7 +8,7 @@ demobase=${demo##*/}
 
 cp "$demo" data/"$demobase"
 
-strace -qo strace.txt -f -e trace=open ./all run -nohome -readonly -forceqmenu -window "$@" -demo "$demobase"
+USE_RLWRAP=no strace -qo strace.txt -f -e trace=open ./all run -nohome -readonly -forceqmenu -window -nocrashdialog "$@" -demo "$demobase"
 
 allfiles()
 {
@@ -37,10 +36,9 @@ while [ -n "$allfiles" ]; do
 		[ -f "$f" ] || continue
 		fn=${f#*/*/}
 		case "$f" in
-# BUG: DP cannot read the csprogs.dat from the demo in readonly mode, so we have to keep this one for now
-#			*/csprogs.dat)
-#				# spam, skip it
-#				;;
+			*/csprogs.dat)
+				# spam, skip it
+				;;
 			*/unifont-*.ttf)
 				# spam, skip it
 				;;
@@ -66,9 +64,9 @@ while [ -n "$allfiles" ]; do
 done
 
 export do_jpeg=true
-export dp_jpeg_if_not_dds=false
-export jpeg_qual_rgb=80
-export jpeg_qual_a=95
+export do_jpeg_if_not_dds=false
+export jpeg_qual_rgb=70
+export jpeg_qual_a=90
 export do_dds=false
 export do_ogg=true
 export ogg_ogg=true
@@ -81,7 +79,6 @@ cd ..
 mv data/"$demobase" output/
 echo "-xonotic -nohome -readonly -forceqmenu +bind ESCAPE quit $* -demo $demobase" > output/darkplaces.opt
 rm output.pk3
-( cd output && zip -9r ../output.pk3 . )
+( cd output && 7za a -tzip -mx=9 ../output.pk3 . )
 cp "$xonotic" output.exe
-$strip --strip-unneeded output.exe
 cat output.pk3 >> output.exe