use -xonotic now

[xonotic/xonotic.git] / all

diff --git a/all b/all
index fc1b8f2e58372fcee6e1d00890f04e627c0111c7..b879044c5baf96cab95db068fd2b7d773d08a686 100755 (executable)
--- a/all
+++ b/all
@@ -118,7 +118,7 @@ netradiant                    |
 div0-gittools                 |                                                   | master      | no
 data/xonotic-maps.pk3dir      |                                                   | master      |
 mediasource                   |                                                   | master      | no
-fteqcc                        | git://github.com/Blub/qclib.git                   | master      |
+fteqcc                        | http://github.com/Blub/qclib.git                  | master      |
 "
 # todo: in darkplaces, change repobranch to div0-stable
 
@@ -653,9 +653,7 @@ case "$cmd" in
                                exit 1
                        fi
                fi
-               set -- "darkplaces/darkplaces$client" -nexuiz -customgamename Xonotic -customgamedirname1 data -customgamedirname2 "" -customgamescreenshotname xonotic -customgameuserdirname xonotic -mygames "$@"
-               # change this to:
-               #set -- "darkplaces/darkplaces$client" -xonotic -mygames "$@"
+               set -- "darkplaces/darkplaces$client" -xonotic -mygames "$@"
 
                # if pulseaudio is running: USE IT
                if [ -z "$SDL_AUDIODRIVER" ] && ! [ -n "$WE_HATE_OUR_USERS" ] && ! [ x"`uname`" = x"Darwin" ]; then
@@ -666,12 +664,29 @@ case "$cmd" in
                        fi
                fi
 
+               binary=$1
+
                if [ -n "$USE_GDB" ]; then
                        set -- gdb --args "$@"
-               elif which catchsegv >/dev/null 2>&1/; then
+               elif which gdb >/dev/null 2>&1; then
+                       set -- gdb --batch -x savecore.gdb --args "$@"
+               elif which catchsegv >/dev/null 2>&1; then
                        set -- catchsegv "$@"
                fi
-               "$@"
+               rm -f xonotic.core
+               "$@" || true
+               if [ -f xonotic.core ]; then
+                       if yesno "The program has CRASHED. Do you want to examine the core dump?"; then
+                               gdb "$binary" xonotic.core
+                       #elif yesno "You did not want to examine the core dump. Do you want to provide it - including your DarkPlaces checkout - to the Xonotic developers?"; then
+                       #       tar cvzf xonotic.core.tar.gz xonotic.core darkplaces/*.c darkplaces/*.h
+                       #       # somehow send it
+                       #       rm -f xonotic.core.tar.gz
+                       else
+                               echo "The core dump can be examined later by"
+                               echo "  gdb $binary xonotic.core"
+                       fi
+               fi
                ;;
        each|foreach)
                keep_going=false