From 977fd97dbc0d791b251c6a8aa58f10d7411706f3 Mon Sep 17 00:00:00 2001
From: UnknownShadow200 <unknownshadow200@gmail.com>
Date: Thu, 12 Mar 2020 15:03:14 +1100
Subject: [PATCH] For web client, don't crash game if can't allocate more
 memory from browser (usually because exceeding 2GB)

---
 misc/buildbot.sh        | 2 +-
 misc/buildbot_plugin.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/misc/buildbot.sh b/misc/buildbot.sh
index 5cb8ff374..176721061 100644
--- a/misc/buildbot.sh
+++ b/misc/buildbot.sh
@@ -87,7 +87,7 @@ build_osx64() {
 build_web() {
   echo "Building web.."
   rm cc.js
-  $WEB_CC *.c -O1 -o cc.js -s FETCH=1 -s WASM=0 -s LEGACY_VM_SUPPORT=1 -s ALLOW_MEMORY_GROWTH=1 --preload-file texpacks/default.zip -w
+  $WEB_CC *.c -O1 -o cc.js -s FETCH=1 -s WASM=0 -s LEGACY_VM_SUPPORT=1 -s ALLOW_MEMORY_GROWTH=1 -s ABORTING_MALLOC=0 --preload-file texpacks/default.zip -w
   # so game loads textures from classicube.net/static/default.zip
   sed -i 's#cc.data#/static/default.zip#g' cc.js
   # fix texture pack overlay always showing 'Download size: Determining..."
diff --git a/misc/buildbot_plugin.sh b/misc/buildbot_plugin.sh
index a8e508997..5a66ccf6e 100644
--- a/misc/buildbot_plugin.sh
+++ b/misc/buildbot_plugin.sh
@@ -33,10 +33,10 @@ echo "Compiling nix64"
 $NIX64_PATH $FILES -I ~/client/src/ -I ./src/ -o ${PLUGIN}_nix64.so $FLAGS $NIX_FLAGS
 
 echo "Compiling mac32"
-$MAC32_PATH $FILES -I ~/client/src/ -I ./src/ -o ${PLUGIN}_osx32.dylib $FLAGS $MAC_FLAGS
+$MAC32_PATH $FILES -I ~/client/src/ -I ./src/ -o ${PLUGIN}_mac32.dylib $FLAGS $MAC_FLAGS
 
 echo "Compiling mac64"
-$MAC64_PATH $FILES -I ~/client/src/ -I ./src/ -o ${PLUGIN}_osx64.dylib $FLAGS $MAC_FLAGS
+$MAC64_PATH $FILES -I ~/client/src/ -I ./src/ -o ${PLUGIN}_mac64.dylib $FLAGS $MAC_FLAGS
 
 echo "Compiling win32"
 rm ClassiCube.exe ClassiCube.def