vera/nuclide
4
0
Fork 0
Code Issues 32 Pull requests Projects Releases Packages Activity

Following last commit, we allocate EFX data statically up-front too.

Browse source
This commit is contained in:
Marco Cawthorne 2021-11-15 03:59:39 +01:00
parent 58734ec4d2
commit 1e31ab2955
Signed by: eukara
GPG key ID: C196CD8BA993248A
2 changed files with 34 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/client/efx.qc
View file

@ -13,7 +13,23 @@
* IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#ifndef EFXDATA_DYNAMIC
#ifndef EFXDATA_MAX
#define EFXDATA_MAX 64
#endif
#endif
/*
#define EFXDATA_DYNAMIC
Your game can define EFXDATA_DYNAMIC in its progs.src if you want an unpredictable amount of EFX definitions.
Other than that, you can increase the value of EFXDATA_MAX.
We switched to up-front allocation because QCLIB fragments memory like hell as there's
no real garbage collector to speak of
*/
void
EFX_DebugInfo(void)
{
@ -74,8 +90,15 @@ EFX_Load(string efx_file)
}
g_efx_count++;
#ifdef EFXDATA_DYNAMIC
g_efx = (reverbinfo_t *)memrealloc(g_efx, sizeof(reverbinfo_t), i, g_efx_count);
g_efx_name = (string *)memrealloc(g_efx_name, sizeof(string), i, g_efx_count);
#else
if (g_efx_count > EFXDATA_MAX) {
error(sprintf("EFX_Load: Reached EFXDATA_MAX (%d)\n", EFXDATA_MAX));
}
#endif
fh = fopen(strcat("efx/", efx_file, ".efx"), FILE_READ);
@ -308,6 +331,12 @@ EFX_Init(void)
int efx_default;
int efx_underwater;
#ifndef EFXDATA_DYNAMIC
g_efx = (reverbinfo_t *)memalloc(sizeof(reverbinfo_t) * EFXDATA_MAX);
g_efx_name = (string *)memalloc(sizeof(string) * EFXDATA_MAX);
print(sprintf("EFX_Init: Allocated %d bytes\n", (sizeof(string) * EFXDATA_MAX) + (sizeof(reverbinfo_t) * EFXDATA_MAX)));
#endif
efx_default = EFX_Load("default");
efx_underwater = EFX_Load("underwater");
EFX_SetEnvironment(efx_default);

8
src/shared/sound.qc
View file

@ -23,8 +23,8 @@
/*
#define SOUNDSHADER_DYNAMIC
Your game can define PRODATA_DYNAMIC in its progs.src if you want an unpredictable amount of prop data.
Other than that, you can increase the value of PROPDATA_MAX.
Your game can define SOUNDSHADER_DYNAMIC in its progs.src if you want an unpredictable amount of sound shaders.
Other than that, you can increase the value of SOUNDSHADER_MAX.
We switched to up-front allocation because QCLIB fragments memory like hell as there's
no real garbage collector to speak of
@ -47,7 +47,7 @@ Sound_Init(void)
/* make sure it's all reset */
Sound_Shutdown();
#ifndef PROPDATA_DYNAMIC
#ifndef SOUNDSHADER_DYNAMIC
g_sounds = (snd_t *)memalloc(sizeof(snd_t) * SOUNDSHADER_MAX);
print(sprintf("Sound_Init: Allocated %d bytes\n", sizeof(snd_t) * SOUNDSHADER_MAX));
#endif
@ -268,7 +268,7 @@ Sound_Precache(string shader)
g_sounds_count++;
#ifdef PROPDATA_DYNAMIC
#ifdef SOUNDSHADER_DYNAMIC
g_sounds = (snd_t *)memrealloc(g_sounds, sizeof(snd_t), index, g_sounds_count);
#else
if (g_sounds_count >= SOUNDSHADER_MAX) {