diff --git a/Makefile b/Makefile index 0be505ce..8a998caa 100644 --- a/Makefile +++ b/Makefile @@ -1073,7 +1073,7 @@ ifeq ($(PLATFORM),emscripten) CLIENT_CFLAGS+=-s USE_SDL=2 - CLIENT_LDFLAGS+=-s TOTAL_MEMORY=256MB + CLIENT_LDFLAGS+=-s TOTAL_MEMORY=768MB CLIENT_LDFLAGS+=-s STACK_SIZE=5MB CLIENT_LDFLAGS+=-s MIN_WEBGL_VERSION=1 -s MAX_WEBGL_VERSION=2 diff --git a/code/client/snd_openal.c b/code/client/snd_openal.c index 4d368517..7ca23604 100644 --- a/code/client/snd_openal.c +++ b/code/client/snd_openal.c @@ -2532,6 +2532,7 @@ static void S_AL_LerpReverb(const reverb_t* from, const reverb_t* to, float frac //#define CHECK_ERROR() if (qalGetError() != AL_NO_ERROR) Com_Printf(S_COLOR_YELLOW "Error on line %d\n", __LINE__) +#ifdef USE_OPENAL_DLOPEN static qboolean S_AL_SetReverbParameters(const reverb_t *pEFXEAXReverb, ALuint uiEffect) { qboolean bReturn = qfalse; @@ -2574,10 +2575,12 @@ static qboolean S_AL_SetReverbParameters(const reverb_t *pEFXEAXReverb, ALuint u return bReturn; } +#endif // USE_OPENAL_DLOPEN static void S_AL_UpdateEnvironment(void) { +#ifdef USE_OPENAL_DLOPEN if (!s_alEffects.initialized) return; @@ -2600,10 +2603,12 @@ static void S_AL_UpdateEnvironment(void) S_AL_SetReverbParameters(&s_alEffects.env.current, s_alEffects.env.alEffect); qalAuxiliaryEffectSloti(s_alEffects.env.alEffectSlot, AL_EFFECTSLOT_EFFECT, s_alEffects.env.alEffect); } +#endif // USE_OPENAL_DLOPEN } static void S_AL_UpdateUnderwater(void) { +#ifdef USE_OPENAL_DLOPEN if (!s_alEffects.initialized) return; @@ -2639,6 +2644,7 @@ static void S_AL_UpdateUnderwater(void) qalSourcei(src->alSource, AL_DIRECT_FILTER, s_alEffects.water.alFilter); } } +#endif // USE_OPENAL_DLOPEN } /* @@ -2740,6 +2746,7 @@ void S_AL_ClearSoundBuffer( void ) static void S_AL_ShutDownEffects(void) { +#ifdef USE_OPENAL_DLOPEN if (!s_alEffects.initialized) return; @@ -2760,6 +2767,7 @@ static void S_AL_ShutDownEffects(void) Cmd_RemoveCommand("s_alTestReverb"); Cmd_RemoveCommand("writesoundshader"); Cmd_RemoveCommand("writecustinfoparms"); +#endif // USE_OPENAL_DLOPEN } /* @@ -2888,8 +2896,7 @@ void S_AL_Shutdown( void ) QAL_Shutdown(); } -#endif - +#ifdef USE_OPENAL_DLOPEN /* ================= S_AL_InitEFX @@ -3233,6 +3240,8 @@ static qboolean S_AL_InitEffects(ALCdevice* alDevice) return s_alEffects.initialized; } +#endif // USE_OPENAL_DLOPEN +#endif // USE_OPENAL /* ================= @@ -3374,7 +3383,9 @@ qboolean S_AL_Init( soundInterface_t *si ) } qalcMakeContextCurrent( alContext ); +#ifdef USE_OPENAL_DLOPEN S_AL_InitEffects( alDevice ); +#endif // Initialize sources, buffers, music diff --git a/code/web/client-config.json b/code/web/client-config.json index eddf35db..95c83381 100644 --- a/code/web/client-config.json +++ b/code/web/client-config.json @@ -1,47 +1,10 @@ { - "baseq3": { + "Boomstick": { "files": [ - {"src": "baseq3/pak0.pk3", "dst": "/baseq3"}, - {"src": "baseq3/pak1.pk3", "dst": "/baseq3"}, - {"src": "baseq3/pak2.pk3", "dst": "/baseq3"}, - {"src": "baseq3/pak3.pk3", "dst": "/baseq3"}, - {"src": "baseq3/pak4.pk3", "dst": "/baseq3"}, - {"src": "baseq3/pak5.pk3", "dst": "/baseq3"}, - {"src": "baseq3/pak6.pk3", "dst": "/baseq3"}, - {"src": "baseq3/pak7.pk3", "dst": "/baseq3"}, - {"src": "baseq3/pak8.pk3", "dst": "/baseq3"}, - {"src": "baseq3/vm/cgame.qvm", "dst": "/baseq3/vm"}, - {"src": "baseq3/vm/qagame.qvm", "dst": "/baseq3/vm"}, - {"src": "baseq3/vm/ui.qvm", "dst": "/baseq3/vm"} - ] - }, - "missionpack": { - "files": [ - {"src": "missionpack/pak0.pk3", "dst": "/missionpack"}, - {"src": "missionpack/pak1.pk3", "dst": "/missionpack"}, - {"src": "missionpack/pak2.pk3", "dst": "/missionpack"}, - {"src": "missionpack/pak3.pk3", "dst": "/missionpack"}, - {"src": "missionpack/vm/cgame.qvm", "dst": "/missionpack/vm"}, - {"src": "missionpack/vm/qagame.qvm", "dst": "/missionpack/vm"}, - {"src": "missionpack/vm/ui.qvm", "dst": "/missionpack/vm"} - ] - }, - "demoq3": { - "_comment": "Copy baseq3/vm/*.qvm to demoq3/vm/ as the Quake 3 demo QVMs are not compatible. However the botfiles are not fully compatible with newer QVMs.", - "files": [ - {"src": "demoq3/pak0.pk3", "dst": "/demoq3"}, - {"src": "demoq3/vm/cgame.qvm", "dst": "/demoq3/vm"}, - {"src": "demoq3/vm/qagame.qvm", "dst": "/demoq3/vm"}, - {"src": "demoq3/vm/ui.qvm", "dst": "/demoq3/vm"} - ] - }, - "tademo": { - "_comment": "Copy missionpack/vm/*.qvm to tademo/vm/ as the Team Arena demo QVMs are not compatible.", - "files": [ - {"src": "tademo/pak0.pk3", "dst": "/tademo"}, - {"src": "tademo/vm/cgame.qvm", "dst": "/tademo/vm"}, - {"src": "tademo/vm/qagame.qvm", "dst": "/tademo/vm"}, - {"src": "tademo/vm/ui.qvm", "dst": "/tademo/vm"} + {"src": "Boomstick/reaction1.pk3", "dst": "/Boomstick"}, + {"src": "Boomstick/vm/cgame.qvm", "dst": "/Boomstick/vm"}, + {"src": "Boomstick/vm/qagame.qvm", "dst": "/Boomstick/vm"}, + {"src": "Boomstick/vm/ui.qvm", "dst": "/Boomstick/vm"} ] } }