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

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

Browse source
This commit is contained in:
bank 2014-05-01 12:51:08 +04:00
parent e6673eaf30
commit 9f2d44966e
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -587,7 +587,7 @@ bool PlayerData::preload(bool server, String &errorStr)
if (!fileRef) 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; return false;
} }

2
Engine/source/gfx/D3D9/gfxD3D9Shader.cpp
View file

@ -444,7 +444,7 @@ const String GFXD3D9ShaderConstBuffer::describeSelf() const
GenericConstBufferLayout::ParamDesc pd; GenericConstBufferLayout::ParamDesc pd;
mVertexConstBufferLayoutF->getDesc(i, 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; return ret;