Forráskód Böngészése

Fix: Some compilers do not auto-cast String and Path classes to (char *).

bank 11 éve
szülő
commit
9f2d44966e

+ 1 - 1
Engine/source/T3D/player.cpp

@@ -587,7 +587,7 @@ bool PlayerData::preload(bool server, String &errorStr)
 
             if (!fileRef)
             {
-               errorStr = String::ToString("PlayerData: Mounted image %d loading failed, shape \"%s\" is not found.",i,mShapeFP[i].getPath());
+               errorStr = String::ToString("PlayerData: Mounted image %d loading failed, shape \"%s\" is not found.",i,mShapeFP[i].getPath().getFullPath().c_str());
                return false;
             }
 

+ 1 - 1
Engine/source/gfx/D3D9/gfxD3D9Shader.cpp

@@ -444,7 +444,7 @@ const String GFXD3D9ShaderConstBuffer::describeSelf() const
       GenericConstBufferLayout::ParamDesc pd;
       mVertexConstBufferLayoutF->getDesc(i, pd);
 
-      ret += String::ToString("      Constant name: %s", pd.name);
+      ret += String::ToString("      Constant name: %s", pd.name.c_str());
    }
 
    return ret;