Ver código fonte

Fix passing of non-primitive types to varargs functions

Ben Payne 10 anos atrás
pai
commit
da4078c707

+ 3 - 3
Engine/source/platformWin32/winFileio.cpp

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

+ 1 - 1
Engine/source/platformWin32/winMath.cpp

@@ -79,7 +79,7 @@ ConsoleFunction( mathInit, void, 1, 10, "( ... )"
          properties |= CPU_PROP_SSE;
          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);
 }