Optimize vehicle impact code by only calling vlen() if damage would be taken

[xonotic/xonotic-data.pk3dir.git] / qcsrc / tools / qcc.sh

diff --git a/qcsrc/tools/qcc.sh b/qcsrc/tools/qcc.sh
index 38c5c86340a28e6087e31960578dc0c6a1e11740..865e6e592ca48c037932fa643ec80e9dd1b20f83 100755 (executable)
--- a/qcsrc/tools/qcc.sh
+++ b/qcsrc/tools/qcc.sh
@@ -32,7 +32,7 @@ function qpp() {
     err=$?
     set -e
     if [ ${err} -ne 0 ]; then return ${err}; fi
-    sed 's/^#\(line\)\? \([[:digit:]]\+\) "\(.*\)".*/\n#pragma file(\3)\n#pragma line(\2)/g' "${WORKDIR}/${MODE}.txt"
+    sed -E 's/^#(line)? ([[:digit:]]+) "(.*)".*/'$'\\\n''#pragma file(\3)'$'\\\n''#pragma line(\2)/g' "${WORKDIR}/${MODE}.txt"
 }
 
 function qcc() {
@@ -47,12 +47,13 @@ $(return >/dev/null 2>&1) || {
     IN=$3
     case "${OUT}" in
       /*)
+        OUT_ABSOLUTE=${OUT}
         ;;
       *)
-        OUT=${PWD}/${OUT}
+        OUT_ABSOLUTE=${PWD}/${OUT}
         ;;
     esac
     set -x
     qpp "${IN}" "${OUT}" -I. ${QCCIDENT} ${QCCDEFS} > "${WORKDIR}/${MODE}.qc"
-    qcc ${QCCFLAGS} -o "${OUT}" "../${WORKDIR}/${MODE}.qc"
+    qcc ${QCCFLAGS} -o "${OUT_ABSOLUTE}" "../${WORKDIR}/${MODE}.qc"
 }