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

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

2
Engine/source/gfx/D3D11/gfxD3D11Shader.cpp
View file

@ -1060,7 +1060,7 @@ void GFXD3D11Shader::_getShaderConstants( ID3D11ShaderReflection *refTable,
#ifdef TORQUE_DEBUG
AssertFatal(constantBufferDesc.Type == D3D_CT_CBUFFER, "Only scalar cbuffers supported for now.");
if (dStrcmp(constantBufferDesc.Name, "$Globals") != 0 && dStrcmp(constantBufferDesc.Name, "$Params") != 0)
if (String::compare(constantBufferDesc.Name, "$Globals") != 0 && String::compare(constantBufferDesc.Name, "$Params") != 0)
AssertFatal(false, "Only $Global and $Params cbuffer supported for now.");
#endif
#ifdef D3D11_DEBUG_SPEW

2
Engine/source/gfx/gfxTextureManager.cpp
View file

@ -1158,7 +1158,7 @@ DefineEngineFunction(saveCompositeTexture, void, (const char* pathR, const char*
{
U32 inputKey[4] = {0,0,0,0};
if (dStrcmp(inputKeyString, "") != 0)
if (String::compare(inputKeyString, "") != 0)
{
dSscanf(inputKeyString, "%i %i %i %i", &inputKey[0], &inputKey[1], &inputKey[2], &inputKey[3]);
}