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

Merge branch 'development' of https://github.com/GarageGames/Torque3D into memberMess

Browse source 
# Conflicts:
#	Engine/source/console/consoleFunctions.cpp
This commit is contained in:
Azaezel 2018-03-28 15:42:34 -05:00
commit cbce2ee805
154 changed files with 2950 additions and 705 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/sfx/openal/sfxALProvider.cpp
View file

@ -114,7 +114,7 @@ void SFXALProvider::init()
dSprintf( temp, sizeof( temp ), "[EAX %d.0] %s", eax, ( mALDL->IsExtensionSupported( i, SFXALEAXRAM ) ? "EAX-RAM" : "" ) );
}
else
dStrcpy( temp, "" );
dStrcpy( temp, "", 256 );
info->driver = String::ToString( deviceFormat, major, minor, temp );
info->hasHardware = eax > 0;
@ -144,4 +144,4 @@ SFXDevice *SFXALProvider::createDevice( const String& deviceName, bool useHardwa
return new SFXALDevice( this, mOpenAL, info->name, useHardware, maxBuffers );
return NULL;
}
}