TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-26 23:59:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

tAlgorythm fed namespace T3D for better library interoperability. resulted in the need to specify usage in... a few places.

Browse source
This commit is contained in:
Azaezel 2017-12-19 16:04:46 -06:00
parent 83449bbc06
commit 491a7dcfdd
20 changed files with 70 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/forest/forestDataFile.cpp
View file

@ -213,7 +213,7 @@ bool ForestData::write( const char *path )
Vector<ForestItem>::const_iterator iter = items.begin();
for ( ; iter != items.end(); iter++ )
{
U8 dataIndex = find( allDatablocks.begin(), allDatablocks.end(), iter->getData() ) - allDatablocks.begin();
U8 dataIndex = T3D::find( allDatablocks.begin(), allDatablocks.end(), iter->getData() ) - allDatablocks.begin();
stream.write( dataIndex );
@ -770,7 +770,7 @@ U32 ForestData::getDatablocks( Vector<ForestItemData*> *outVector ) const
{
ForestItemData *data = item->getData();
if ( find( outVector->begin(), outVector->end(), data ) != outVector->end() )
if (T3D::find( outVector->begin(), outVector->end(), data ) != outVector->end() )
continue;
count++;

4
Engine/source/forest/forestWindMgr.cpp
View file

@ -85,7 +85,7 @@ void ForestWindMgr::addEmitter( ForestWindEmitter *emitter )
void ForestWindMgr::removeEmitter( ForestWindEmitter *emitter )
{
ForestWindEmitterList::iterator iter = find( mEmitters.begin(),
ForestWindEmitterList::iterator iter = T3D::find( mEmitters.begin(),
mEmitters.end(),
emitter );
@ -161,7 +161,7 @@ void ForestWindMgr::processTick()
PROFILE_SCOPE( ForestWindMgr_AdvanceTime_SwapSources );
AssertFatal( mPrevSources->isEmpty(), "prev sources not empty!" );
swap( mSources, mPrevSources );
T3D::swap( mSources, mPrevSources );
AssertFatal( mSources->isEmpty(), "swap failed!" );
}