TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-27 15:25:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #342 from lukaspj/fix/replace-dstrcmp

Browse source 
Replace uses of dStrCmp with new String::compare
This commit is contained in:
Brian Roberts 2020-10-03 17:01:12 -05:00 • committed by GitHub
commit d50f1f0b81
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
85 changed files with 213 additions and 189 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -61,7 +61,7 @@ ALDeviceList::ALDeviceList( const OPENALFNTABLE &oalft )
index = 0;
// go through device list (each device terminated with a single NULL, list terminated with double NULL)
while (*devices != 0) {
if (dStrcmp(defaultDeviceName, devices) == 0) {
if (String::compare(defaultDeviceName, devices) == 0) {
defaultDeviceIndex = index;
}
ALCdevice *device = ALFunction.alcOpenDevice(devices);
@ -73,7 +73,7 @@ ALDeviceList::ALDeviceList( const OPENALFNTABLE &oalft )
actualDeviceName = ALFunction.alcGetString(device, ALC_DEVICE_SPECIFIER);
bool bNewName = true;
for (int i = 0; i < GetNumDevices(); i++) {
if (dStrcmp(GetDeviceName(i), actualDeviceName) == 0) {
if (String::compare(GetDeviceName(i), actualDeviceName) == 0) {
bNewName = false;
}
}

4
Engine/source/sfx/sfxSource.cpp
View file

@ -1576,14 +1576,14 @@ DefineEngineMethod( SFXSource, setTransform, void, ( const char * position, cons
{
MatrixF mat = object->getTransform();
if(dStrcmp( position , "")!=0 )
if(String::compare( position , "")!=0 )
{
Point3F pos;
dSscanf( position, "%g %g %g", &pos.x, &pos.y, &pos.z );
mat.setPosition( pos );
}
if(dStrcmp( direction ,"")!=0 )
if(String::compare( direction ,"")!=0 )
{
Point3F dir;
dSscanf( direction, "%g %g %g", &dir.x, &dir.y, &dir.z );