]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
in .options files, change syntax to allow settings on different lines. Syntax rules...
authorRudolf Polzer <divverent@alientrap.org>
Thu, 24 Jun 2010 13:53:02 +0000 (15:53 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 24 Jun 2010 13:53:02 +0000 (15:53 +0200)
any line starting with - specifies options
any other line is a comment
anything from a # in a line to the end of the line is a comment

(Bad) Example:

-bsp -samplesize 16 # do not use default options
-light + -fast # this looks good too, default options are still used
-vis +
-minimap +
Version: 1

misc/tools/xonotic-map-compiler-autobuild

index 3f411004700a156e7bd8dff47ee7c1b53f524285..6405eb2b1fe7fc62e6f56cdfedddd898cce96729 100755 (executable)
@@ -123,7 +123,7 @@ buildthemap()
        fi
        (
                cd maps
        fi
        (
                cd maps
-               ../../../misc/tools/xonotic-map-compiler "$M" `head -n 1 "$M.map.options"` 2>&1 | tee "$M.log"
+               ../../../misc/tools/xonotic-map-compiler "$M" `grep ^- "$M.map.options" | cut -d '#' -f 1` 2>&1 | tee "$M.log"
        )
        zip -9r "$bspdir/$M-$blobhash.pk3" "maps/$M.bsp" "maps/$M.log" "maps/$M/" "maps/$M.lin" "gfx/${M}_mini.tga"
        ln -snf "../$M-$blobhash.pk3" "$bspdir/latest/$M.pk3" # from ALL branches, so beware!
        )
        zip -9r "$bspdir/$M-$blobhash.pk3" "maps/$M.bsp" "maps/$M.log" "maps/$M/" "maps/$M.lin" "gfx/${M}_mini.tga"
        ln -snf "../$M-$blobhash.pk3" "$bspdir/latest/$M.pk3" # from ALL branches, so beware!