Merge branch 'master' into martin-t/example-config
authorMartin Taibr <taibr.martin@gmail.com>
Wed, 21 Feb 2018 09:42:34 +0000 (10:42 +0100)
committerMartin Taibr <taibr.martin@gmail.com>
Wed, 21 Feb 2018 09:42:34 +0000 (10:42 +0100)
misc/tools/all/release.subr
release.cmake
server/server.cfg

index 13cc2bc..0b30a9b 100644 (file)
@@ -88,7 +88,7 @@ release_common()
 
        getversion()
        {
-               gv=`grep "^gameversion " "$1/defaultXonotic.cfg" | awk '{ print $2 }'`
+               gv=`grep "^gameversion " "$1/xonotic-common.cfg" | awk '{ print $2 }'`
                major=$(($gv / 10000))
                minor=$((($gv / 100) - ($major * 100)))
                patch=$(($gv - ($major * 10000) - ($minor * 100)))
@@ -409,21 +409,21 @@ case "$cmd" in
                                        s/^set g_xonoticversion [^ ]* /set g_xonoticversion $versionstr /;
                                        s/^gameversion_min [0-9]*/gameversion_min     0/;
                                        s/^gameversion_max [0-9]*/gameversion_max  9999/;
-                               " < defaultXonotic.cfg > defaultXonotic.cfg.new
+                               " < xonotic-common.cfg > xonotic-common.cfg.new
                        else
                                # >= 1.0
                                verbose sed "
                                        s/^set g_xonoticversion [^ ]* /set g_xonoticversion $versionstr /;
                                        s/^gameversion_min [0-9]*/gameversion_min $(( ($gv / 100) * 100 - 100 ))/;
                                        s/^gameversion_max [0-9]*/gameversion_max $(( ($gv / 100) * 100 + 199 ))/;
-                               " < defaultXonotic.cfg > defaultXonotic.cfg.new
+                               " < xonotic-common.cfg > xonotic-common.cfg.new
                        fi
-                       mv defaultXonotic.cfg.new defaultXonotic.cfg
+                       mv xonotic-common.cfg.new xonotic-common.cfg
                        case "$RELEASETYPE" in
                                release)
-                                       echo "" >> defaultXonotic.cfg
-                                       echo "// nicer menu" >> defaultXonotic.cfg
-                                       echo "set menu_watermark \"\"" >> defaultXonotic.cfg
+                                       echo "" >> xonotic-common.cfg
+                                       echo "// nicer menu" >> xonotic-common.cfg
+                                       echo "set menu_watermark \"\"" >> xonotic-common.cfg
                                        ;;
                        esac
                        (
index 124d7d7..44b16eb 100644 (file)
@@ -9,9 +9,9 @@ add_custom_target(release)
 string(TIMESTAMP stamp "%Y%m%d")
 string(TIMESTAMP filestamp "%Y-%m-%d")
 
-file(STRINGS data/xonotic-data.pk3dir/defaultXonotic.cfg _contents REGEX "^gameversion ")
+file(STRINGS data/xonotic-data.pk3dir/xonotic-common.cfg _contents REGEX "^gameversion ")
 if (NOT _contents)
-    message(FATAL_ERROR "defaultXonotic.cfg does not contain gameversion")
+    message(FATAL_ERROR "xonotic-common.cfg does not contain gameversion")
 else ()
     string(REGEX REPLACE ".*gameversion ([0-9]+).*" "\\1" versionstr "${_contents}")
     math(EXPR versionstr_major "${versionstr} / 10000")
index 0dcb151..40e366e 100644 (file)
@@ -206,7 +206,7 @@ sv_weaponstats_file http://www.xonotic.org/weaponbalance/
 /////////////////////////////////////////////////////////////////////
 // Overkill mod settings
 
-// To enable Overkill, put 'exec defaultOverkill.cfg' at the top of this file (above any other cvar changes), don't use 'g_overkill 1' directly.
+// To enable Overkill, put 'exec ruleset-overkill.cfg' at the top of this file (above any other cvar changes), don't use 'g_overkill 1' directly.
 // You should also consider enabling 'g_fullbrightplayers 1'.