mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-06-01 02:26:38 +00:00
Merge remote-tracking branch 'upstream/development' into development
This commit is contained in:
commit
fdecae153d
1 changed files with 9 additions and 6 deletions
|
|
@ -521,7 +521,7 @@ void SFXEmitter::unpackUpdate( NetConnection *conn, BitStream *stream )
|
|||
}
|
||||
|
||||
// track
|
||||
if (stream->readFlag()) // DirtyUpdateMask
|
||||
if (_readDirtyFlag(stream, Track)) // DirtyUpdateMask
|
||||
{
|
||||
initialUpdate = false;
|
||||
UNPACK_ASSET(conn, Sound);
|
||||
|
|
@ -1109,9 +1109,10 @@ void SFXEmitter::_renderCone( F32 radialIncrements, F32 sweepIncrements,
|
|||
|
||||
void SFXEmitter::play()
|
||||
{
|
||||
if( mSource )
|
||||
if (mSource)
|
||||
mSource->play();
|
||||
else
|
||||
|
||||
if(isServerObject())
|
||||
{
|
||||
// By clearing the playback masks first we
|
||||
// ensure the last playback command called
|
||||
|
|
@ -1128,7 +1129,8 @@ void SFXEmitter::pause()
|
|||
{
|
||||
if (mSource)
|
||||
mSource->pause();
|
||||
else
|
||||
|
||||
if(isServerObject())
|
||||
{
|
||||
// By clearing the playback masks first we
|
||||
// ensure the last playback command called
|
||||
|
|
@ -1143,9 +1145,10 @@ void SFXEmitter::pause()
|
|||
|
||||
void SFXEmitter::stop()
|
||||
{
|
||||
if ( mSource )
|
||||
if (mSource)
|
||||
mSource->stop();
|
||||
else
|
||||
|
||||
if(isServerObject())
|
||||
{
|
||||
// By clearing the playback masks first we
|
||||
// ensure the last playback command called
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue