TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-15 16:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added dStrIsEmpty and replaced some incorrect string comparisons.

Browse source
This commit is contained in:
Daniel Buckmaster 2014-12-21 20:40:02 +11:00
parent 9396ae7176
commit 03f71a78c0
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Engine/source/core/strings/stringFunctions.h
View file

@ -59,6 +59,11 @@ inline S32 dStrcmp(const char *str1, const char *str2)
return strcmp(str1, str2); return strcmp(str1, str2);
} }
inline bool dStrIsEmpty(const char *src)
{
return src == 0 || !dStrcmp(src, "");
}
inline S32 dStrncmp(const char *str1, const char *str2, dsize_t len) inline S32 dStrncmp(const char *str1, const char *str2, dsize_t len)
{ {
return strncmp(str1, str2, len); return strncmp(str1, str2, len);

4
Engine/source/gui/worldEditor/terrainEditor.cpp
View file

@ -2761,9 +2761,9 @@ DefineConsoleMethod(TerrainEditor, getTerrainUnderWorldPoint, S32, (const char *
if(tEditor == NULL) if(tEditor == NULL)
return 0; return 0;
Point3F pos; Point3F pos;
if(ptOrX != "" && Y == "" && Z == "") if(!dStrIsEmpty(ptOrX) && dStrIsEmpty(Y) && dStrIsEmpty(Z))
dSscanf(ptOrX, "%f %f %f", &pos.x, &pos.y, &pos.z); dSscanf(ptOrX, "%f %f %f", &pos.x, &pos.y, &pos.z);
else if(ptOrX != "" && Y != "" && Z != "") else if(!dStrIsEmpty(ptOrX) && !dStrIsEmpty(Y) && !dStrIsEmpty(Z))
{ {
pos.x = dAtof(ptOrX); pos.x = dAtof(ptOrX);
pos.y = dAtof(Y); pos.y = dAtof(Y);