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

Merge pull request #1322 from Areloch/String_isEmpty_Convert

Browse source 
Replace uses of dStrIsEmpty with new String::isEmpty
This commit is contained in:
Areloch 2015-10-31 23:40:13 -05:00
commit 165cdb64e9
11 changed files with 29 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Engine/source/terrain/terrData.cpp
View file

@ -150,9 +150,9 @@ DefineConsoleFunction( getTerrainUnderWorldPoint, S32, (const char* ptOrX, const
"@hide")
{
Point3F pos;
if(!dStrIsEmpty(ptOrX) && dStrIsEmpty(y) && dStrIsEmpty(z))
if(!String::isEmpty(ptOrX) && String::isEmpty(y) && String::isEmpty(z))
dSscanf(ptOrX, "%f %f %f", &pos.x, &pos.y, &pos.z);
else if(!dStrIsEmpty(ptOrX) && !dStrIsEmpty(y) && !dStrIsEmpty(z))
else if(!String::isEmpty(ptOrX) && !String::isEmpty(y) && !String::isEmpty(z))
{
pos.x = dAtof(ptOrX);
pos.y = dAtof(y);
@ -1333,9 +1333,9 @@ DefineConsoleFunction( getTerrainHeight, F32, (const char* ptOrX, const char* y)
F32 height = 0.0f;
Point2F pos;
if(!dStrIsEmpty(ptOrX) && dStrIsEmpty(y))
if(!String::isEmpty(ptOrX) && String::isEmpty(y))
dSscanf(ptOrX, "%f %f", &pos.x, &pos.y);
else if(!dStrIsEmpty(ptOrX) && !dStrIsEmpty(y))
else if(!String::isEmpty(ptOrX) && !String::isEmpty(y))
{
pos.x = dAtof(ptOrX);
pos.y = dAtof(y);
@ -1380,9 +1380,9 @@ DefineConsoleFunction( getTerrainHeightBelowPosition, F32, (const char* ptOrX, c
F32 height = 0.0f;
Point3F pos;
if(!dStrIsEmpty(ptOrX) && dStrIsEmpty(y) && dStrIsEmpty(z))
if(!String::isEmpty(ptOrX) && String::isEmpty(y) && String::isEmpty(z))
dSscanf(ptOrX, "%f %f %f", &pos.x, &pos.y, &pos.z);
else if(!dStrIsEmpty(ptOrX) && !dStrIsEmpty(y) && !dStrIsEmpty(z))
else if(!String::isEmpty(ptOrX) && !String::isEmpty(y) && !String::isEmpty(z))
{
pos.x = dAtof(ptOrX);
pos.y = dAtof(y);