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

if statement

Browse source 
treat "true" as a bool in getInt check (inside if statements for strings)
no longer convert all "true" and "false" to ints
This commit is contained in:
marauder2k7 2024-06-16 20:01:47 +01:00
parent e56f4cb6a6
commit d6a79e4f5b
3 changed files with 11 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Engine/source/console/console.h
View file

@ -245,7 +245,17 @@ public:
if (type == ConsoleValueType::cvSTEntry) if (type == ConsoleValueType::cvSTEntry)
return s == StringTable->EmptyString() ? 0 : dAtoi(s); return s == StringTable->EmptyString() ? 0 : dAtoi(s);
if (type == ConsoleValueType::cvString) if (type == ConsoleValueType::cvString)
return dStrcmp(s, "") == 0 ? 0 : dIsdigit(*s) ? dAtoi(s) : s == StringTable->EmptyString() ? 0 : 1; {
if (dStrcmp(s, "false") == 0) {
return 0;
}
else if (dStrcmp(s, "true") == 0) {
return 1;
}
return dIsdigit(*s) ? dAtoi(s) : s == StringTable->EmptyString() ? 0 : 1;
}
return dAtoi(getConsoleData()); return dAtoi(getConsoleData());
} }

12
Engine/source/console/torquescript/CMDscan.cpp
View file

@ -2827,18 +2827,6 @@ static int Sc_ScanString(int ret)
if(!collapseEscape(CMDtext+1)) if(!collapseEscape(CMDtext+1))
return -1; return -1;
const char* scannedStr = CMDtext + 1;
if (dStrcmp(scannedStr, "true") == 0) {
CMDlval.i = MakeToken<int>(1, yylineno);
return INTCONST;
}
if (dStrcmp(scannedStr, "false") == 0) {
CMDlval.i = MakeToken<int>(0, yylineno);
return INTCONST;
}
dsize_t bufferLen = dStrlen( CMDtext ); dsize_t bufferLen = dStrlen( CMDtext );
char* buffer = ( char* ) consoleAlloc( bufferLen ); char* buffer = ( char* ) consoleAlloc( bufferLen );
dStrcpy( buffer, CMDtext + 1, bufferLen ); dStrcpy( buffer, CMDtext + 1, bufferLen );

12
Engine/source/console/torquescript/CMDscan.l
View file

@ -377,18 +377,6 @@ static int Sc_ScanString(int ret)
if(!collapseEscape(CMDtext+1)) if(!collapseEscape(CMDtext+1))
return -1; return -1;
const char* scannedStr = CMDtext + 1;
if (dStrcmp(scannedStr, "true") == 0) {
CMDlval.i = MakeToken<int>(1, yylineno);
return INTCONST;
}
if (dStrcmp(scannedStr, "false") == 0) {
CMDlval.i = MakeToken<int>(0, yylineno);
return INTCONST;
}
dsize_t bufferLen = dStrlen( CMDtext ); dsize_t bufferLen = dStrlen( CMDtext );
char* buffer = ( char* ) consoleAlloc( bufferLen ); char* buffer = ( char* ) consoleAlloc( bufferLen );
dStrcpy( buffer, CMDtext + 1, bufferLen ); dStrcpy( buffer, CMDtext + 1, bufferLen );