mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-10 22:24:33 +00:00
Merge pull request #1322 from Areloch/String_isEmpty_Convert
Replace uses of dStrIsEmpty with new String::isEmpty
This commit is contained in:
commit
165cdb64e9
11 changed files with 29 additions and 29 deletions
|
|
@ -2831,9 +2831,9 @@ DefineConsoleMethod( GuiControl, setExtent, void, ( const char* extOrX, const ch
|
|||
"@hide" )
|
||||
{
|
||||
Point2I extent;
|
||||
if(!dStrIsEmpty(extOrX) && dStrIsEmpty(y))
|
||||
if(!String::isEmpty(extOrX) && String::isEmpty(y))
|
||||
dSscanf(extOrX, "%d %d", &extent.x, &extent.y);
|
||||
else if(!dStrIsEmpty(extOrX) && !dStrIsEmpty(y))
|
||||
else if(!String::isEmpty(extOrX) && !String::isEmpty(y))
|
||||
{
|
||||
extent.x = dAtoi(extOrX);
|
||||
extent.y = dAtoi(y);
|
||||
|
|
|
|||
|
|
@ -2763,9 +2763,9 @@ DefineConsoleMethod(TerrainEditor, getTerrainUnderWorldPoint, S32, (const char *
|
|||
if(tEditor == NULL)
|
||||
return 0;
|
||||
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);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue