make overriding more strict again

[xonotic/xonotic.git] / misc / tools / xonotic-map-compiler-autobuild

diff --git a/misc/tools/xonotic-map-compiler-autobuild b/misc/tools/xonotic-map-compiler-autobuild
index ccfdfa69ff9935690daedb6952808493031ffe75..d366157d3df2f4db0f7fc70839c418ddf2e89de3 100755 (executable)
--- a/misc/tools/xonotic-map-compiler-autobuild
+++ b/misc/tools/xonotic-map-compiler-autobuild
@@ -172,7 +172,13 @@ buildthemap()
        t0=`date +%s`
        (
                cd maps
-               ../../../misc/tools/xonotic-map-compiler "$M" `grep ^- "$M.map.options" | cut -d '#' -f 1` $build_override > "$M.log"
+               sz=`grep '^size ' "$M.mapinfo" 2>/dev/null || true`
+               if [ -n "$sz" ]; then
+                       minimap_override="-minimap + -minmax ${sz#size }"
+               else
+                       minimap_override=
+               fi
+               ../../../misc/tools/xonotic-map-compiler "$M" `grep ^- "$M.map.options" | cut -d '#' -f 1` $minimap_override $build_override > "$M.log"
        )
        t1=`date +%s`
        dt=$(($t1 - $t0))
@@ -203,10 +209,6 @@ screenshotthemap()
                continue
        fi
 
-       git reset --hard
-       git clean -xfd
-       git checkout -f "$commithash"
-
        rm -rf ~/.xonotic
        (
                cd ../..
@@ -319,6 +321,10 @@ case "$1" in
                                continue
                        fi
 
+                       git reset --hard
+                       git clean -xfd
+                       git checkout -f "$HASH"
+
                        rundownload
                        if $getthemap_fail; then
                                continue