TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-13 07:34:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'GarageGames/master' into ueberengine-dev

Browse source 
Conflicts:
	Engine/source/T3D/fps/guiCrossHairHud.cpp
This commit is contained in:
Duion 2016-07-27 13:44:27 +02:00
commit 81750f3deb
2827 changed files with 315755 additions and 121398 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/sfx/fmod/sfxFMODDevice.h
View file

@ -105,8 +105,8 @@ struct FModFNTable
}
~FModFNTable()
{
eventDllRef = NULL;
dllRef = NULL;
eventDllRef = NULL;
delete mutex;
}

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

@ -1467,7 +1467,7 @@ DefineConsoleFunction( sfxCreateSource, S32, ( const char * sfxType, const char
if ( track )
{
// In this overloaded use of the function, arg0..arg2 are x, y, and z.
if ( dStrIsEmpty(arg0) )
if ( String::isEmpty(arg0) )
{
source = SFX->createSource( track );
}
@ -1489,7 +1489,7 @@ DefineConsoleFunction( sfxCreateSource, S32, ( const char * sfxType, const char
}
else
{
if ( dStrIsEmpty(arg1) )
if ( String::isEmpty(arg1) )
{
source = SFX->createSource( tempProfile );
}
@ -1552,7 +1552,7 @@ DefineConsoleFunction( sfxPlay, S32, ( const char * trackName, const char * poin
"Start playing the given source or create a new source for the given track and play it.\n"
"@hide" )
{
if ( dStrIsEmpty(pointOrX) )
if ( String::isEmpty(pointOrX) )
{
SFXSource* source = dynamic_cast<SFXSource*>( Sim::findObject( trackName ) );
if ( source )
@ -1570,11 +1570,11 @@ DefineConsoleFunction( sfxPlay, S32, ( const char * trackName, const char * poin
}
Point3F pos(0.f, 0.f, 0.f);
if ( !dStrIsEmpty( pointOrX ) && dStrIsEmpty( y ) && dStrIsEmpty( z ) )
if ( !String::isEmpty( pointOrX ) && String::isEmpty( y ) && String::isEmpty( z ) )
{
dSscanf( pointOrX, "%g %g %g", &pos.x, &pos.y, &pos.z );
}
else if( !dStrIsEmpty( pointOrX ) && !dStrIsEmpty( y ) && !dStrIsEmpty( z ) )
else if( !String::isEmpty( pointOrX ) && !String::isEmpty( y ) && !String::isEmpty( z ) )
pos.set( dAtof(pointOrX), dAtof(y), dAtof(z) );
MatrixF transform;
@ -1679,7 +1679,7 @@ DefineConsoleFunction( sfxPlayOnce, S32, ( const char * sfxType, const char * ar
if( track )
{
// In this overloaded use, arg0..arg2 are x, y, z, and arg3 is the fadeInTime.
if (dStrIsEmpty(arg0))
if (String::isEmpty(arg0))
{
source = SFX->playOnce( track );
}
@ -1701,7 +1701,7 @@ DefineConsoleFunction( sfxPlayOnce, S32, ( const char * sfxType, const char * ar
}
else
{
if (dStrIsEmpty(arg1))
if (String::isEmpty(arg1))
source = SFX->playOnce( tempProfile );
else
{

14
Engine/source/sfx/sfxTypes.cpp
View file

@ -112,7 +112,7 @@ inline bool sResolve( T** ptr, String& errorString )
// TypeSFXSourceName.
//=============================================================================
ConsoleType( SFXSource, TypeSFXSourceName, SFXSource* )
ConsoleType(SFXSource, TypeSFXSourceName, SFXSource*, "")
ConsoleGetType( TypeSFXSourceName )
{
@ -138,7 +138,7 @@ ConsoleSetType( TypeSFXSourceName )
// TypeSFXParameterName.
//=============================================================================
ConsoleType( string, TypeSFXParameterName, StringTableEntry )
ConsoleType(string, TypeSFXParameterName, StringTableEntry, "")
ConsoleGetType( TypeSFXParameterName )
{
@ -157,7 +157,7 @@ ConsoleSetType( TypeSFXParameterName )
// TypeSFXDescriptionName.
//=============================================================================
ConsoleType( SFXDescription, TypeSFXDescriptionName, SFXDescription* )
ConsoleType(SFXDescription, TypeSFXDescriptionName, SFXDescription*, "")
ConsoleSetType( TypeSFXDescriptionName )
{
@ -184,7 +184,7 @@ ConsoleGetType( TypeSFXDescriptionName )
// TypeSFXTrackName.
//=============================================================================
ConsoleType( SFXTrack, TypeSFXTrackName, SFXTrack* )
ConsoleType( SFXTrack, TypeSFXTrackName, SFXTrack*, "" )
ConsoleSetType( TypeSFXTrackName )
{
@ -211,7 +211,7 @@ ConsoleGetType( TypeSFXTrackName )
// TypeSFXEnvironmentName.
//=============================================================================
ConsoleType( SFXEnvironment, TypeSFXEnvironmentName, SFXEnvironment* )
ConsoleType(SFXEnvironment, TypeSFXEnvironmentName, SFXEnvironment*, "")
ConsoleSetType( TypeSFXEnvironmentName )
{
@ -238,7 +238,7 @@ ConsoleGetType( TypeSFXEnvironmentName )
// TypeSFXStateName.
//=============================================================================
ConsoleType( SFXState, TypeSFXStateName, SFXState* )
ConsoleType(SFXState, TypeSFXStateName, SFXState*, "")
ConsoleSetType( TypeSFXStateName )
{
@ -265,7 +265,7 @@ ConsoleGetType( TypeSFXStateName )
// TypeSFXAmbienceName.
//=============================================================================
ConsoleType( SFXAmbience, TypeSFXAmbienceName, SFXAmbience* )
ConsoleType(SFXAmbience, TypeSFXAmbienceName, SFXAmbience*, "")
ConsoleSetType( TypeSFXAmbienceName )
{