zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-02-20 18:42:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

New feature: combine SF_GLOBAL and SF_DTAG definesound flags to get Duke3D explosion sound behavior

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

2
source/duke3d/src/actors.cpp
View file

@ -1529,7 +1529,7 @@ ACTOR_STATIC void G_MoveFX(void)
}
}
if (g_sounds[pSprite->lotag].m & SF_GLOBAL)
if ((g_sounds[pSprite->lotag].m & (SF_GLOBAL|SF_DTAG)) == SF_GLOBAL)
{
// Randomly playing global sounds (flyby of planes, screams, ...)

2
source/duke3d/src/game.cpp
View file

@ -3960,7 +3960,7 @@ void G_DoSpriteAnimations(int32_t ourx, int32_t oury, int32_t oura, int32_t smoo
targetang = clamp(targetang, -128, 128);
t->ang += targetang;
}
else
else if (!display_mirror)
t->cstat |= 2;
}

2
source/duke3d/src/sector.cpp
View file

@ -66,7 +66,7 @@ int A_CallSound(int sectNum, int spriteNum)
if (T1(SFXsprite) == 0)
{
if ((g_sounds[soundNum].m & SF_GLOBAL) == 0)
if ((g_sounds[soundNum].m & (SF_GLOBAL|SF_DTAG)) != SF_GLOBAL)
{
if (soundNum)
{

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

@ -582,7 +582,7 @@ static bool S_CalcDistAndAng(int32_t spriteNum, int32_t soundNum, int32_t sectNu
}
#endif
if ((g_sounds[soundNum].m & SF_GLOBAL) == 0 && S_IsAmbientSFX(spriteNum) && (sector[SECT(spriteNum)].lotag&0xff) < 9) // ST_9_SLIDING_ST_DOOR
if ((g_sounds[soundNum].m & (SF_GLOBAL|SF_DTAG)) != SF_GLOBAL && S_IsAmbientSFX(spriteNum) && (sector[SECT(spriteNum)].lotag&0xff) < 9) // ST_9_SLIDING_ST_DOOR
sndist = divscale14(sndist, SHT(spriteNum)+1);
sound_further_processing:
@ -594,6 +594,14 @@ sound_further_processing:
&& !cansee(cam->x, cam->y, cam->z - (24 << 8), sectNum, SX(spriteNum), SY(spriteNum), SZ(spriteNum) - (24 << 8), SECT(spriteNum)))
sndist += sndist>>5;
if ((g_sounds[soundNum].m & (SF_GLOBAL|SF_DTAG)) == (SF_GLOBAL|SF_DTAG))
{
boost:
explosion = true;
if (sndist > 6144)
sndist = 6144;
}
else
#ifndef EDUKE32_STANDALONE
if (!FURY)
{
@ -602,15 +610,12 @@ sound_further_processing:
case PIPEBOMB_EXPLODE__STATIC:
case LASERTRIP_EXPLODE__STATIC:
case RPG_EXPLODE__STATIC:
explosion = true;
if (sndist > 6144)
sndist = 6144;
break;
goto boost;
}
}
#endif
if ((g_sounds[soundNum].m & SF_GLOBAL) || sndist < ((255-LOUDESTVOLUME) << 6))
if ((g_sounds[soundNum].m & (SF_GLOBAL|SF_DTAG)) == SF_GLOBAL || sndist < ((255-LOUDESTVOLUME) << 6))
sndist = ((255-LOUDESTVOLUME) << 6);
*distPtr = sndist;
@ -657,7 +662,7 @@ int S_PlaySound3D(int num, int spriteNum, const vec3_t *pos)
if ((g_sounds[j].m & SF_TALK) && g_sounds[j].num > 0)
return -1;
}
else if (snd.m & SF_DTAG) // Duke-Tag sound
else if ((snd.m & (SF_DTAG|SF_GLOBAL)) == SF_DTAG) // Duke-Tag sound
{
int const voice = S_PlaySound(sndNum);