From d4170718e59f2d3c11e78a94ad2a66531c16f34b Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Sat, 16 Apr 2011 14:43:36 +0300 Subject: [PATCH] Update all engine components to latest version --- voretournament-linux-glx.sh | 23 ++++++++++++++++------- voretournament-linux-sdl.sh | 2 +- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/voretournament-linux-glx.sh b/voretournament-linux-glx.sh index 02097049..a0b4f3a7 100644 --- a/voretournament-linux-glx.sh +++ b/voretournament-linux-glx.sh @@ -16,9 +16,9 @@ case "$(uname -m)" in *) arch="linux32" ;; esac -xonotic="xonotic-${arch}-${mode}" +voretournament="voretournament-${arch}-${mode}" -set -- ./${xonotic} "${@}" +set -- ./${voretournament} "${@}" xserver= xlayout= @@ -43,14 +43,14 @@ setdisplay() } # now how do we execute it? -if [ -r ~/.xonotic/data/config.cfg ]; then +if [ -r ~/.voretournament/data/config.cfg ]; then while read -r CMD KEY VALUE; do case "$CMD:$KEY" in seta:vid_x11_display) setdisplay "$VALUE" ;; esac - done < ~/.xonotic/data/config.cfg + done < ~/.voretournament/data/config.cfg fi m=0 @@ -88,10 +88,10 @@ case "$xserver" in # X server already exists export DISPLAY=:$xserver prefix="DISPLAY=:$xserver " - msg=$msg$lf"- Running Xonotic on already existing display :$xserver" + msg=$msg$lf"- Running VoreTournament on already existing display :$xserver" else set -- startx "$@" -fullscreen -- ":$xserver" - msg=$msg$lf"- Running Xonotic on a newly created X server :$xserver." + msg=$msg$lf"- Running VoreTournament on a newly created X server :$xserver." case "$xlayout" in '') ;; @@ -111,11 +111,20 @@ case "$xserver" in echo "Resulting command line:" echo " $prefix$*" echo - echo "To undo these overrides, edit ~/.xonotic/data/config.cfg and remove the line" + echo "To undo these overrides, edit ~/.voretournament/data/config.cfg and remove the line" echo "starting with 'seta vid_x11_display'." echo echo ;; esac +# if pulseaudio +if [ -z "$SDL_AUDIODRIVER" ]; then + if ps -C pulseaudio >/dev/null; then + if ldd /usr/lib/libSDL.so 2>/dev/null | grep pulse >/dev/null; then + export SDL_AUDIODRIVER=pulse + fi + fi +fi + exec "$@" diff --git a/voretournament-linux-sdl.sh b/voretournament-linux-sdl.sh index 41f63aaf..0bce4b8f 100644 --- a/voretournament-linux-sdl.sh +++ b/voretournament-linux-sdl.sh @@ -1 +1 @@ -xonotic-linux-glx.sh \ No newline at end of file +voretournament-linux-glx.sh \ No newline at end of file -- 2.39.2