Merge remote-tracking branch 'upstream/development' into development

This commit is contained in:
marauder2k7 2026-05-24 20:42:46 +01:00
commit fdecae153d

View file

@ -521,7 +521,7 @@ void SFXEmitter::unpackUpdate( NetConnection *conn, BitStream *stream )
} }
// track // track
if (stream->readFlag()) // DirtyUpdateMask if (_readDirtyFlag(stream, Track)) // DirtyUpdateMask
{ {
initialUpdate = false; initialUpdate = false;
UNPACK_ASSET(conn, Sound); UNPACK_ASSET(conn, Sound);
@ -1109,9 +1109,10 @@ void SFXEmitter::_renderCone( F32 radialIncrements, F32 sweepIncrements,
void SFXEmitter::play() void SFXEmitter::play()
{ {
if( mSource ) if (mSource)
mSource->play(); mSource->play();
else
if(isServerObject())
{ {
// By clearing the playback masks first we // By clearing the playback masks first we
// ensure the last playback command called // ensure the last playback command called
@ -1128,7 +1129,8 @@ void SFXEmitter::pause()
{ {
if (mSource) if (mSource)
mSource->pause(); mSource->pause();
else
if(isServerObject())
{ {
// By clearing the playback masks first we // By clearing the playback masks first we
// ensure the last playback command called // ensure the last playback command called
@ -1143,9 +1145,10 @@ void SFXEmitter::pause()
void SFXEmitter::stop() void SFXEmitter::stop()
{ {
if ( mSource ) if (mSource)
mSource->stop(); mSource->stop();
else
if(isServerObject())
{ {
// By clearing the playback masks first we // By clearing the playback masks first we
// ensure the last playback command called // ensure the last playback command called