TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 11:43:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into console-func-refactor

Browse source 
Conflicts:
	Engine/source/app/net/net.cpp
	Engine/source/console/astNodes.cpp
	Engine/source/console/compiledEval.cpp
	Engine/source/console/console.h
	Engine/source/console/consoleInternal.h
	Engine/source/console/engineAPI.h
This commit is contained in:
Daniel Buckmaster 2014-10-14 14:40:17 +11:00
commit b507dc9555
6487 changed files with 315149 additions and 609761 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Engine/source/sfx/sfxSystem.cpp
View file

@ -686,7 +686,8 @@ void SFXSystem::_onRemoveSource( SFXSource* source )
if( dynamic_cast< SFXSound* >( source ) )
{
SFXSoundVector::iterator iter = find( mSounds.begin(), mSounds.end(), static_cast< SFXSound* >( source ) );
mSounds.erase_fast( iter );
if( iter != mSounds.end() )
mSounds.erase_fast( iter );
mStatNumSounds = mSounds.size();
}
@ -854,7 +855,7 @@ void SFXSystem::_updateSources()
if( source->getLastStatus() == SFXStatusStopped &&
source->getSavedStatus() != SFXStatusPlaying )
{
int index = iter - mPlayOnceSources.begin();
S32 index = iter - mPlayOnceSources.begin();
// Erase it from the vector first, so that onRemoveSource
// doesn't do it during cleanup and screw up our loop here!