diff --git a/srb2-vc10.sln b/srb2-vc10.sln index 94625fbb0..763cdc350 100644 --- a/srb2-vc10.sln +++ b/srb2-vc10.sln @@ -41,8 +41,8 @@ Global {0F554F1D-ED49-4D65-A9A7-F63C57F277BE}.Release|ARM.Build.0 = Release|ARM {0F554F1D-ED49-4D65-A9A7-F63C57F277BE}.Release|ARM64.ActiveCfg = Release|ARM64 {0F554F1D-ED49-4D65-A9A7-F63C57F277BE}.Release|ARM64.Build.0 = Release|ARM64 - {0F554F1D-ED49-4D65-A9A7-F63C57F277BE}.Release|Win32.ActiveCfg = Debug|Win32 - {0F554F1D-ED49-4D65-A9A7-F63C57F277BE}.Release|Win32.Build.0 = Debug|Win32 + {0F554F1D-ED49-4D65-A9A7-F63C57F277BE}.Release|Win32.ActiveCfg = Release|Win32 + {0F554F1D-ED49-4D65-A9A7-F63C57F277BE}.Release|Win32.Build.0 = Release|Win32 {0F554F1D-ED49-4D65-A9A7-F63C57F277BE}.Release|x64.ActiveCfg = Release|x64 {0F554F1D-ED49-4D65-A9A7-F63C57F277BE}.Release|x64.Build.0 = Release|x64 {72B01ACA-7A1A-4F7B-ACEF-2607299CF052}.Debug|ARM.ActiveCfg = Debug|ARM @@ -57,8 +57,8 @@ Global {72B01ACA-7A1A-4F7B-ACEF-2607299CF052}.Release|ARM.Build.0 = Release|ARM {72B01ACA-7A1A-4F7B-ACEF-2607299CF052}.Release|ARM64.ActiveCfg = Release|ARM64 {72B01ACA-7A1A-4F7B-ACEF-2607299CF052}.Release|ARM64.Build.0 = Release|ARM64 - {72B01ACA-7A1A-4F7B-ACEF-2607299CF052}.Release|Win32.ActiveCfg = Debug|Win32 - {72B01ACA-7A1A-4F7B-ACEF-2607299CF052}.Release|Win32.Build.0 = Debug|Win32 + {72B01ACA-7A1A-4F7B-ACEF-2607299CF052}.Release|Win32.ActiveCfg = Release|Win32 + {72B01ACA-7A1A-4F7B-ACEF-2607299CF052}.Release|Win32.Build.0 = Release|Win32 {72B01ACA-7A1A-4F7B-ACEF-2607299CF052}.Release|x64.ActiveCfg = Release|x64 {72B01ACA-7A1A-4F7B-ACEF-2607299CF052}.Release|x64.Build.0 = Release|x64 {51137D5C-4E81-4955-AACF-EA3092006051}.Debug|ARM.ActiveCfg = Debug|ARM @@ -73,8 +73,8 @@ Global {51137D5C-4E81-4955-AACF-EA3092006051}.Release|ARM.Build.0 = Release|ARM {51137D5C-4E81-4955-AACF-EA3092006051}.Release|ARM64.ActiveCfg = Release|ARM64 {51137D5C-4E81-4955-AACF-EA3092006051}.Release|ARM64.Build.0 = Release|ARM64 - {51137D5C-4E81-4955-AACF-EA3092006051}.Release|Win32.ActiveCfg = Debug|Win32 - {51137D5C-4E81-4955-AACF-EA3092006051}.Release|Win32.Build.0 = Debug|Win32 + {51137D5C-4E81-4955-AACF-EA3092006051}.Release|Win32.ActiveCfg = Release|Win32 + {51137D5C-4E81-4955-AACF-EA3092006051}.Release|Win32.Build.0 = Release|Win32 {51137D5C-4E81-4955-AACF-EA3092006051}.Release|x64.ActiveCfg = Release|x64 {51137D5C-4E81-4955-AACF-EA3092006051}.Release|x64.Build.0 = Release|x64 {73A5729C-7323-41D4-AB48-8A03C9F81603}.Debug|ARM.ActiveCfg = Debug|ARM @@ -89,8 +89,8 @@ Global {73A5729C-7323-41D4-AB48-8A03C9F81603}.Release|ARM.Build.0 = Release|ARM {73A5729C-7323-41D4-AB48-8A03C9F81603}.Release|ARM64.ActiveCfg = Release|ARM64 {73A5729C-7323-41D4-AB48-8A03C9F81603}.Release|ARM64.Build.0 = Release|ARM64 - {73A5729C-7323-41D4-AB48-8A03C9F81603}.Release|Win32.ActiveCfg = Debug|Win32 - {73A5729C-7323-41D4-AB48-8A03C9F81603}.Release|Win32.Build.0 = Debug|Win32 + {73A5729C-7323-41D4-AB48-8A03C9F81603}.Release|Win32.ActiveCfg = Release|Win32 + {73A5729C-7323-41D4-AB48-8A03C9F81603}.Release|Win32.Build.0 = Release|Win32 {73A5729C-7323-41D4-AB48-8A03C9F81603}.Release|x64.ActiveCfg = Release|x64 {73A5729C-7323-41D4-AB48-8A03C9F81603}.Release|x64.Build.0 = Release|x64 {E662D0B3-412D-4D55-A5EC-8CBD680DDCBE}.Debug|ARM.ActiveCfg = Debug|ARM @@ -99,7 +99,7 @@ Global {E662D0B3-412D-4D55-A5EC-8CBD680DDCBE}.Debug|x64.ActiveCfg = Debug|x64 {E662D0B3-412D-4D55-A5EC-8CBD680DDCBE}.Release|ARM.ActiveCfg = Release|ARM {E662D0B3-412D-4D55-A5EC-8CBD680DDCBE}.Release|ARM64.ActiveCfg = Release|ARM64 - {E662D0B3-412D-4D55-A5EC-8CBD680DDCBE}.Release|Win32.ActiveCfg = Debug|Win32 + {E662D0B3-412D-4D55-A5EC-8CBD680DDCBE}.Release|Win32.ActiveCfg = Release|Win32 {E662D0B3-412D-4D55-A5EC-8CBD680DDCBE}.Release|x64.ActiveCfg = Release|x64 {61BA7D3C-F77D-4D31-B718-1177FE482CF2}.Debug|ARM.ActiveCfg = Debug|ARM {61BA7D3C-F77D-4D31-B718-1177FE482CF2}.Debug|ARM.Build.0 = Debug|ARM @@ -113,8 +113,8 @@ Global {61BA7D3C-F77D-4D31-B718-1177FE482CF2}.Release|ARM.Build.0 = Release|ARM {61BA7D3C-F77D-4D31-B718-1177FE482CF2}.Release|ARM64.ActiveCfg = Release|ARM64 {61BA7D3C-F77D-4D31-B718-1177FE482CF2}.Release|ARM64.Build.0 = Release|ARM64 - {61BA7D3C-F77D-4D31-B718-1177FE482CF2}.Release|Win32.ActiveCfg = Debug|Win32 - {61BA7D3C-F77D-4D31-B718-1177FE482CF2}.Release|Win32.Build.0 = Debug|Win32 + {61BA7D3C-F77D-4D31-B718-1177FE482CF2}.Release|Win32.ActiveCfg = Release|Win32 + {61BA7D3C-F77D-4D31-B718-1177FE482CF2}.Release|Win32.Build.0 = Release|Win32 {61BA7D3C-F77D-4D31-B718-1177FE482CF2}.Release|x64.ActiveCfg = Release|x64 {61BA7D3C-F77D-4D31-B718-1177FE482CF2}.Release|x64.Build.0 = Release|x64 {2C3C45EC-A621-4845-AAEB-9CB82A6D32B4}.Debug|ARM.ActiveCfg = Debug|Win32 diff --git a/src/p_local.h b/src/p_local.h index e44137449..3c8395e10 100644 --- a/src/p_local.h +++ b/src/p_local.h @@ -228,7 +228,7 @@ void P_PrecipitationEffects(void); void P_RemoveMobj(mobj_t *th); boolean P_MobjWasRemoved(mobj_t *th); -void P_RemoveSavegameMobj(mobj_t *th); +void P_RemoveSavegameMobj(mobj_t *th, boolean preserveLevel); boolean P_SetPlayerMobjState(mobj_t *mobj, statenum_t state); boolean P_SetMobjState(mobj_t *mobj, statenum_t state); //void P_RunShields(void); diff --git a/src/p_mobj.c b/src/p_mobj.c index 4cfcebc1b..8bf5282c7 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -10390,7 +10390,7 @@ void P_RemovePrecipMobj(precipmobj_t *mobj) } // Clearing out stuff for savegames -void P_RemoveSavegameMobj(mobj_t *mobj) +void P_RemoveSavegameMobj(mobj_t *mobj, boolean preserveLevel) { // unlink from sector and block lists P_UnsetThingPosition(mobj); @@ -10403,7 +10403,15 @@ void P_RemoveSavegameMobj(mobj_t *mobj) } // stop any playing sound - S_StopSound(mobj); + if (!preserveLevel) + { + S_StopSound(mobj); + } + else + { + // detach any playing sounds from this mobj, but don't destroy them as they might still be there + S_DetachChannelsFromOrigin(mobj); + } // free block P_RemoveThinker((thinker_t *)mobj); diff --git a/src/p_saveg.c b/src/p_saveg.c index 94f4e19be..4bb2a86f9 100644 --- a/src/p_saveg.c +++ b/src/p_saveg.c @@ -2804,7 +2804,7 @@ static void CollectDebugObjectList(void) { // // P_NetUnArchiveThinkers // -static void P_NetUnArchiveThinkers(void) +static void P_NetUnArchiveThinkers(boolean preserveLevel) { thinker_t *currentthinker; thinker_t *next; @@ -2849,7 +2849,7 @@ static void P_NetUnArchiveThinkers(void) currentthinker->references = 0; if (currentthinker->function.acp1 == (actionf_p1)P_MobjThinker) - P_RemoveSavegameMobj((mobj_t *)currentthinker); // item isn't saved, don't remove it + P_RemoveSavegameMobj((mobj_t *)currentthinker, preserveLevel); // item isn't saved, don't remove it else if (currentthinker->function.acp1 == (actionf_p1)P_NullPrecipThinker) P_RemovePrecipMobj((precipmobj_t*)currentthinker); else { @@ -3721,7 +3721,7 @@ boolean P_LoadNetGame(boolean preserveLevel) #ifdef POLYOBJECTS P_UnArchivePolyObjects(); #endif - P_NetUnArchiveThinkers(); + P_NetUnArchiveThinkers(preserveLevel); P_NetUnArchiveSpecials(); P_RelinkPointers(); P_FinishMobjs(); diff --git a/src/s_sound.c b/src/s_sound.c index 21b668f28..f1a9d5f3b 100644 --- a/src/s_sound.c +++ b/src/s_sound.c @@ -46,7 +46,7 @@ extern INT32 msg_id; // 3D Sound Interface #include "hardware/hw3sound.h" #else -static INT32 S_AdjustSoundParams(const mobj_t *listener, const mobj_t *source, INT32 *vol, INT32 *sep, INT32 *pitch, sfxinfo_t *sfxinfo); +static INT32 S_AdjustSoundParams(const mobj_t *listener, fixed_t x, fixed_t y, fixed_t z, INT32 *vol, INT32 *sep, INT32 *pitch, sfxinfo_t *sfxinfo); #endif CV_PossibleValue_t soundvolume_cons_t[] = {{0, "MIN"}, {31, "MAX"}, {0, NULL}}; @@ -248,6 +248,7 @@ static INT32 S_getChannel(const void *origin, sfxinfo_t *sfxinfo) // channel is decided to be cnum. c->sfxinfo = sfxinfo; c->origin = origin; + c->isdetached = false; return cnum; } @@ -583,7 +584,7 @@ void S_StartSoundAtVolume(const void *origin_p, sfxenum_t sfx_id, INT32 volume) if (origin && origin != listenmobj2) { INT32 rc; - rc = S_AdjustSoundParams(listenmobj2, origin, &volume, &sep, &pitch, sfx); + rc = S_AdjustSoundParams(listenmobj2, origin->x, origin->y, origin->z, &volume, &sep, &pitch, sfx); if (!rc) goto dontplay; // Maybe the other player can hear it... @@ -749,7 +750,7 @@ dontplay4: if (origin && origin != listenmobj) { INT32 rc; - rc = S_AdjustSoundParams(listenmobj, origin, &volume, &sep, &pitch, sfx); + rc = S_AdjustSoundParams(listenmobj, origin->x, origin->y, origin->z, &volume, &sep, &pitch, sfx); if (!rc) return; @@ -1053,6 +1054,8 @@ void S_UpdateSounds(void) { if (I_SoundIsPlaying(c->handle)) { + boolean isspatial = c->origin || c->isdetached; + // initialize parameters volume = 255; // 8 bits internal volume precision pitch = NORM_PITCH; @@ -1063,11 +1066,28 @@ void S_UpdateSounds(void) // check non-local sounds for distance clipping // or modify their params - if (c->origin && ((c->origin != players[consoleplayer].mo) + if (isspatial && + (c->origin && ((c->origin != players[consoleplayer].mo) || (splitscreen && c->origin != players[displayplayers[1]].mo) || (splitscreen > 1 && c->origin != players[displayplayers[2]].mo) - || (splitscreen > 2 && c->origin != players[displayplayers[3]].mo))) + || (splitscreen > 2 && c->origin != players[displayplayers[3]].mo)))) { + fixed_t x, y, z; + const mobj_t *soundmobj = c->origin; + + if (c->isdetached) + { + x = c->detachedx; + y = c->detachedy; + z = c->detachedz; + } + else + { + x = soundmobj->x; + y = soundmobj->y; + z = soundmobj->z; + } + // Whomever is closer gets the sound, but only in splitscreen. if (splitscreen) { @@ -1102,25 +1122,25 @@ void S_UpdateSounds(void) if (p == 1) { // Player 2 gets the sound - audible = S_AdjustSoundParams(listenmobj2, c->origin, &volume, &sep, &pitch, + audible = S_AdjustSoundParams(listenmobj2, x, y, z, &volume, &sep, &pitch, c->sfxinfo); } else if (p == 2) { // Player 3 gets the sound - audible = S_AdjustSoundParams(listenmobj3, c->origin, &volume, &sep, &pitch, + audible = S_AdjustSoundParams(listenmobj3, x, y, z, &volume, &sep, &pitch, c->sfxinfo); } else if (p == 3) { // Player 4 gets the sound - audible = S_AdjustSoundParams(listenmobj4, c->origin, &volume, &sep, &pitch, + audible = S_AdjustSoundParams(listenmobj4, x, y, z, &volume, &sep, &pitch, c->sfxinfo); } else { // Player 1 gets the sound - audible = S_AdjustSoundParams(listenmobj, c->origin, &volume, &sep, &pitch, + audible = S_AdjustSoundParams(listenmobj, x, y, z, &volume, &sep, &pitch, c->sfxinfo); } @@ -1133,7 +1153,7 @@ void S_UpdateSounds(void) else if (listenmobj && !splitscreen) { // In the case of a single player, he or she always should get updated sound. - audible = S_AdjustSoundParams(listenmobj, c->origin, &volume, &sep, &pitch, + audible = S_AdjustSoundParams(listenmobj, x, y, z, &volume, &sep, &pitch, c->sfxinfo); if (audible) @@ -1203,6 +1223,28 @@ static void S_StopChannel(INT32 cnum) } } +// +// S_DetachChannelFromSource +// +// Detaches a sound channel from the object it came from, leaving it loose +// +void S_DetachChannelsFromOrigin(void* origin) +{ + int i; + mobj_t* originmobj = (mobj_t*)origin; + for (i = 0; i < numofchannels; i++) + { + if (channels[i].origin == origin) + { + channels[i].origin = NULL; + channels[i].isdetached = true; + channels[i].detachedx = originmobj->x; + channels[i].detachedy = originmobj->y; + channels[i].detachedz = originmobj->z; + } + } +} + // // S_CalculateSoundDistance // @@ -1237,7 +1279,7 @@ fixed_t S_CalculateSoundDistance(fixed_t sx1, fixed_t sy1, fixed_t sz1, fixed_t // If the sound is not audible, returns a 0. // Otherwise, modifies parameters and returns 1. // -INT32 S_AdjustSoundParams(const mobj_t *listener, const mobj_t *source, INT32 *vol, INT32 *sep, INT32 *pitch, +INT32 S_AdjustSoundParams(const mobj_t *listener, fixed_t x, fixed_t y, fixed_t z, INT32 *vol, INT32 *sep, INT32 *pitch, sfxinfo_t *sfxinfo) { fixed_t approx_dist; @@ -1318,8 +1360,7 @@ INT32 S_AdjustSoundParams(const mobj_t *listener, const mobj_t *source, INT32 *v } else { - approx_dist = S_CalculateSoundDistance(listensource.x, listensource.y, listensource.z, - source->x, source->y, source->z); + approx_dist = S_CalculateSoundDistance(listensource.x, listensource.y, listensource.z, x, y, z); } // Ring loss, deaths, etc, should all be heard louder. @@ -1337,7 +1378,7 @@ INT32 S_AdjustSoundParams(const mobj_t *listener, const mobj_t *source, INT32 *v return 0; // angle of source to listener - angle = R_PointToAngle2(listensource.x, listensource.y, source->x, source->y); + angle = R_PointToAngle2(listensource.x, listensource.y, x, y); if (angle > listensource.angle) angle = angle - listensource.angle; diff --git a/src/s_sound.h b/src/s_sound.h index 2a904faff..0d8cbaddd 100644 --- a/src/s_sound.h +++ b/src/s_sound.h @@ -74,6 +74,40 @@ typedef struct { angle_t angle; } listener_t; +typedef struct +{ + // sound information (if null, channel avail.) + sfxinfo_t *sfxinfo; + + // origin of sound + const void *origin; + + // handle of the sound being played + INT32 handle; + + // whether the sound is detached from its source (sound panning should not be changed) + boolean isdetached; + + // positioning for detached sounds + fixed_t detachedx, detachedy, detachedz; + +} channel_t; + +typedef struct { + channel_t *c; + sfxinfo_t *s; + UINT16 t; + UINT8 b; +} caption_t; + +#define NUMCAPTIONS 8 +#define MAXCAPTIONTICS (2*TICRATE) +#define CAPTIONFADETICS 20 + +extern caption_t closedcaptions[NUMCAPTIONS]; +void S_StartCaption(sfxenum_t sfx_id, INT32 cnum, UINT16 lifespan); +void S_ResetCaptions(void); + // register sound vars and commands at game startup void S_RegisterSoundStuff(void); @@ -107,6 +141,10 @@ void S_StartSoundAtVolume(const void *origin, sfxenum_t sound_id, INT32 volume); // Stop sound for thing at void S_StopSound(void *origin); +// Detaches a sound from an object, leaving it in the air at the object's original position +void S_DetachChannelsFromOrigin(void* origin); + + // // Music Status //