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

Fixed String comparisons.

Browse source
This commit is contained in:
Vincent Gee 2014-11-05 23:29:08 -05:00
parent d6570e3533
commit 2f48f31a6f
5 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/T3D/aiClient.cpp
View file

@ -547,7 +547,7 @@ DefineConsoleFunction( aiAddPlayer, S32, (const char * name, const char * ns), (
aiPlayer->onConnect_callback( name ); aiPlayer->onConnect_callback( name );
// Now execute the onAdd command and feed it the namespace // Now execute the onAdd command and feed it the namespace
if( ns != "" ) if(dStrcmp( ns,"" ) != 0 )
aiPlayer->onAdd( ns ); aiPlayer->onAdd( ns );
else else
aiPlayer->onAdd( "AIClient" ); aiPlayer->onAdd( "AIClient" );

2
Engine/source/console/consoleFunctions.cpp
View file

@ -2382,7 +2382,7 @@ DefineConsoleFunction( isDefined, bool, ( const char* varName, const char* varVa
// Is it an object? // Is it an object?
if (dStrcmp(varName, "0") && dStrcmp(varName, "") && (Sim::findObject(varName) != NULL)) if (dStrcmp(varName, "0") && dStrcmp(varName, "") && (Sim::findObject(varName) != NULL))
return true; return true;
else if (varValue != "") else if (dStrcmp(varValue, "" ) != 0)
{ {
Con::errorf("%s() - can't assign a value to a variable of the form \"%s\"", __FUNCTION__, varValue); Con::errorf("%s() - can't assign a value to a variable of the form \"%s\"", __FUNCTION__, varValue);
} }

4
Engine/source/console/persistenceManager.cpp
View file

@ -2201,7 +2201,7 @@ DefineConsoleMethod( PersistenceManager, setDirty, void, ( const char * objName
"Mark an existing SimObject as dirty (will be written out when saveDirty() is called).") "Mark an existing SimObject as dirty (will be written out when saveDirty() is called).")
{ {
SimObject *dirtyObject = NULL; SimObject *dirtyObject = NULL;
if (objName != "") if (dStrcmp(objName,"") != 0)
{ {
if (!Sim::findObject(objName, dirtyObject)) if (!Sim::findObject(objName, dirtyObject))
{ {
@ -2387,7 +2387,7 @@ DefineConsoleMethod( PersistenceManager, removeField, void, (const char * objNam
if (dirtyObject) if (dirtyObject)
{ {
if (fieldName != "") if (dStrcmp(fieldName,"") != 0)
object->addRemoveField(dirtyObject, fieldName); object->addRemoveField(dirtyObject, fieldName);
} }
} }

2
Engine/source/gui/controls/guiTreeViewCtrl.cpp
View file

@ -5114,7 +5114,7 @@ DefineConsoleMethod(GuiTreeViewCtrl, moveItemDown, void, (S32 index), , "(TreeIt
DefineConsoleMethod(GuiTreeViewCtrl, getTextToRoot, const char*, (S32 itemId, const char * delimiter), , DefineConsoleMethod(GuiTreeViewCtrl, getTextToRoot, const char*, (S32 itemId, const char * delimiter), ,
"(TreeItemId item,Delimiter=none) gets the text from the current node to the root, concatenating at each branch upward, with a specified delimiter optionally") "(TreeItemId item,Delimiter=none) gets the text from the current node to the root, concatenating at each branch upward, with a specified delimiter optionally")
{ {
if ( delimiter == "" ) if (!dStrcmp(delimiter, "" ))
{ {
Con::warnf("GuiTreeViewCtrl::getTextToRoot - Invalid number of arguments!"); Con::warnf("GuiTreeViewCtrl::getTextToRoot - Invalid number of arguments!");
return (""); return ("");

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

@ -1566,11 +1566,11 @@ DefineConsoleFunction( sfxPlay, S32, ( const char * trackName, const char * poin
} }
Point3F pos(0.f, 0.f, 0.f); Point3F pos(0.f, 0.f, 0.f);
if ( pointOrX != "" && y == ""&& z == "" ) if (dStrcmp( pointOrX, "" ) != 0 && dStrcmp( y, "" ) == 0 && dStrcmp( z, "" ) == 0 )
{ {
dSscanf( pointOrX, "%g %g %g", &pos.x, &pos.y, &pos.z ); dSscanf( pointOrX, "%g %g %g", &pos.x, &pos.y, &pos.z );
} }
else if( pointOrX != "" && y != "" && z != "" ) else if(dStrcmp( pointOrX, "" ) != 0 && dStrcmp( y, "" ) != 0 && dStrcmp( z, "" ) != 0 )
pos.set( dAtof(pointOrX), dAtof(y), dAtof(z) ); pos.set( dAtof(pointOrX), dAtof(y), dAtof(z) );
MatrixF transform; MatrixF transform;