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

Fix passing of non-primitive types to varargs functions

Browse source
This commit is contained in:
Ben Payne 2015-03-04 16:00:02 -05:00
parent 7d809a0d28
commit da4078c707
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Engine/source/platformWin32/winFileio.cpp
View file

@ -1409,9 +1409,9 @@ static bool recurseDumpDirectories(const char *basePath, const char *subPath, Ve
if( ( subPath && ( dStrncmp( subPath, "", 1 ) != 0 ) )) if( ( subPath && ( dStrncmp( subPath, "", 1 ) != 0 ) ))
{ {
if( subTrail == '/' ) if( subTrail == '/' )
dSprintf(search, search.size, "%s%s", subPath, fileName); dSprintf(search, search.size, "%s%s", subPath, fileName.ptr);
else else
dSprintf(search, search.size, "%s/%s", subPath, fileName); dSprintf(search, search.size, "%s/%s", subPath, fileName.ptr);
char* child = search; char* child = search;
if( currentDepth < recurseDepth || recurseDepth == -1 ) if( currentDepth < recurseDepth || recurseDepth == -1 )
@ -1425,7 +1425,7 @@ static bool recurseDumpDirectories(const char *basePath, const char *subPath, Ve
child = fileName; child = fileName;
else else
{ {
dSprintf(search, search.size, "/%s", fileName); dSprintf(search, search.size, "/%s", fileName.ptr);
child = search; child = search;
} }

2
Engine/source/platformWin32/winMath.cpp
View file

@ -79,7 +79,7 @@ ConsoleFunction( mathInit, void, 1, 10, "( ... )"
properties |= CPU_PROP_SSE; properties |= CPU_PROP_SSE;
continue; continue;
} }
Con::printf("Error: MathInit(): ignoring unknown math extension '%s'", *argv); Con::printf("Error: MathInit(): ignoring unknown math extension '%s'", argv->getStringValue());
} }
Math::init(properties); Math::init(properties);
} }