Remove static buffers from StringHelpers to prevent overwriting strings from another thread.
This commit is contained in:
parent
3f7745b262
commit
5d459c0ff9
15 changed files with 68 additions and 55 deletions
|
|
@ -160,15 +160,15 @@ BufferedImage::BufferedImage(const wstring& File, bool filenameHasExtension /*=f
|
|||
name = wDrive + L"res" + filePath.substr(0,filePath.length()-4) + mipMapPath + L".png";
|
||||
}
|
||||
|
||||
const char *pchTextureName=wstringtofilename(name);
|
||||
auto pchTextureName=wstringtofilename(name);
|
||||
|
||||
#ifndef _CONTENT_PACKAGE
|
||||
app.DebugPrintf("\n--- Loading TEXTURE - %s\n\n",pchTextureName);
|
||||
app.DebugPrintf("\n--- Loading TEXTURE - %s\n\n",pchTextureName.c_str());
|
||||
#endif
|
||||
|
||||
D3DXIMAGE_INFO ImageInfo;
|
||||
ZeroMemory(&ImageInfo,sizeof(D3DXIMAGE_INFO));
|
||||
hr=RenderManager.LoadTextureData(pchTextureName,&ImageInfo,&data[l]);
|
||||
hr=RenderManager.LoadTextureData(pchTextureName.c_str(), &ImageInfo, &data[l]);
|
||||
|
||||
|
||||
if(hr!=ERROR_SUCCESS)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue