From ce9a9cbed154ef1c135d6f6ab66e78ff6cefa223 Mon Sep 17 00:00:00 2001 From: Leshana Date: Thu, 30 Apr 2020 19:24:10 -0400 Subject: [PATCH 1/2] Make failing unit tests actually fail travis checks. --- tools/travis/compile_and_run.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/travis/compile_and_run.sh b/tools/travis/compile_and_run.sh index b4f9e403b02..fa3c382943e 100644 --- a/tools/travis/compile_and_run.sh +++ b/tools/travis/compile_and_run.sh @@ -33,6 +33,6 @@ fi if [ $RUN -eq 1 ]; then DreamDaemon $BASENAME.dmb -invisible -trusted -core 2>&1 | tee log.txt; - grep "All Unit Tests Passed" log.txt - grep "Caught 0 Runtimes" log.txt + grep "All Unit Tests Passed" log.txt || exit 1 + grep "Caught 0 Runtimes" log.txt || exit 1 fi From 2d0301c6e44c63bf984dff6db6fb1e2ed3afb641 Mon Sep 17 00:00:00 2001 From: Leshana Date: Thu, 30 Apr 2020 19:25:57 -0400 Subject: [PATCH 2/2] Fix bug in ZAS can_atmos_pass optimization. Check the *atom's* density, not the turf's! --- code/ZAS/Atom.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/ZAS/Atom.dm b/code/ZAS/Atom.dm index 700eded6d85..b395c4551e2 100644 --- a/code/ZAS/Atom.dm +++ b/code/ZAS/Atom.dm @@ -101,7 +101,7 @@ turf/c_airblock(turf/other) if(ATMOS_PASS_NO) return BLOCKED if(ATMOS_PASS_DENSITY) - if(density) + if(M.density) return BLOCKED if(ATMOS_PASS_PROC) result |= M.c_airblock(other)