zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 11:10:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add S_SetProperties() function to handle repetitious setting of a few sound structure members

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@7913 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2019-08-07 22:44:20 +00:00 committed by Christoph Oelckers
parent 40e54fdbbb
commit 789be3cf35
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
source/duke3d/src/sounds.cpp
View file

@ -42,6 +42,14 @@ std::atomic<uint32_t> dnum;
uint32_t dq[DQSIZE]; uint32_t dq[DQSIZE];
static mutex_t m_callback; static mutex_t m_callback;
static inline void S_SetProperties(assvoice_t *snd, int const owner, int const voice, int const dist, int const clock)
{
snd->owner = owner;
snd->id = voice;
snd->dist = dist;
snd->clock = clock;
}
void S_SoundStartup(void) void S_SoundStartup(void)
{ {
#ifdef MIXERTYPEWIN #ifdef MIXERTYPEWIN
@ -66,10 +74,7 @@ void S_SoundStartup(void)
for (auto & voice : g_sounds[i].voices) for (auto & voice : g_sounds[i].voices)
{ {
g_sounds[i].num = 0; g_sounds[i].num = 0;
voice.id = 0; S_SetProperties(&voice, -1, 0, UINT16_MAX, 0);
voice.owner = -1;
voice.dist = UINT16_MAX;
voice.clock = 0;
} }
#ifdef CACHING_DOESNT_SUCK #ifdef CACHING_DOESNT_SUCK
@ -426,10 +431,7 @@ void S_Cleanup(void)
if (spriteNum != -1 && S_IsAmbientSFX(spriteNum) && sector[SECT(spriteNum)].lotag < 3) // ST_2_UNDERWATER if (spriteNum != -1 && S_IsAmbientSFX(spriteNum) && sector[SECT(spriteNum)].lotag < 3) // ST_2_UNDERWATER
actor[spriteNum].t_data[0] = 0; actor[spriteNum].t_data[0] = 0;
voice.owner = -1; S_SetProperties(&voice, -1, 0, UINT16_MAX, 0);
voice.id = 0;
voice.dist = UINT16_MAX;
voice.clock = 0;
#ifdef CACHING_DOESNT_SUCK #ifdef CACHING_DOESNT_SUCK
--g_soundlocks[num]; --g_soundlocks[num];
@ -751,10 +753,8 @@ int S_PlaySound3D(int num, int spriteNum, const vec3_t *pos)
} }
snd.num++; snd.num++;
snd.voices[sndSlot].owner = spriteNum;
snd.voices[sndSlot].id = voice; S_SetProperties(&snd.voices[sndSlot], spriteNum, voice, sndist >> 6, 0);
snd.voices[sndSlot].dist = sndist >> 6;
snd.voices[sndSlot].clock = 0;
return voice; return voice;
} }