mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-09-21 20:06:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Automatically convert all CLogger format strings from wchar_t* to char*.

Browse Source 
Done with:

  ag -ls 'LOG(MESSAGE|MESSAGERENDER|WARNING|ERROR)' source | xargs sed
-i 's/LOG\(MESSAGE\|MESSAGERENDER\|WARNING\|ERROR\)(L/LOG\1(/g'

This was SVN commit r16183.
This commit is contained in:
Ykkrosh
2015-01-22 20:31:30 +00:00
parent dcf5a2667f
commit 49e2ecea63
112 changed files with 516 additions and 516 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/graphics/TextureConverter.cpp
+13 -13
View File
@@ -120,7 +120,7 @@ CTextureConverter::SettingsFile* CTextureConverter::LoadSettings(const VfsPath&
if (root.GetNodeName() != el_textures)
{
LOGERROR(L"Invalid texture settings file \"%ls\" (unrecognised root element)", path.string().c_str());
LOGERROR("Invalid texture settings file \"%ls\" (unrecognised root element)", path.string().c_str());
return NULL;
}
@@ -152,7 +152,7 @@ CTextureConverter::SettingsFile* CTextureConverter::LoadSettings(const VfsPath&
else if (v == "alpha")
p.settings.format = FMT_ALPHA;
else
LOGERROR(L"Invalid attribute value <file format='%hs'>", v.c_str());
LOGERROR("Invalid attribute value <file format='%hs'>", v.c_str());
}
else if (attr.Name == at_mipmap)
{
@@ -162,7 +162,7 @@ CTextureConverter::SettingsFile* CTextureConverter::LoadSettings(const VfsPath&
else if (v == "false")
p.settings.mipmap = MIP_FALSE;
else
LOGERROR(L"Invalid attribute value <file mipmap='%hs'>", v.c_str());
LOGERROR("Invalid attribute value <file mipmap='%hs'>", v.c_str());
}
else if (attr.Name == at_normal)
{
@@ -172,7 +172,7 @@ CTextureConverter::SettingsFile* CTextureConverter::LoadSettings(const VfsPath&
else if (v == "false")
p.settings.normal = NORMAL_FALSE;
else
LOGERROR(L"Invalid attribute value <file normal='%hs'>", v.c_str());
LOGERROR("Invalid attribute value <file normal='%hs'>", v.c_str());
}
else if (attr.Name == at_alpha)
{
@@ -184,7 +184,7 @@ CTextureConverter::SettingsFile* CTextureConverter::LoadSettings(const VfsPath&
else if (v == "transparency")
p.settings.alpha = ALPHA_TRANSPARENCY;
else
LOGERROR(L"Invalid attribute value <file alpha='%hs'>", v.c_str());
LOGERROR("Invalid attribute value <file alpha='%hs'>", v.c_str());
}
else if (attr.Name == at_filter)
{
@@ -196,7 +196,7 @@ CTextureConverter::SettingsFile* CTextureConverter::LoadSettings(const VfsPath&
else if (v == "kaiser")
p.settings.filter = FILTER_KAISER;
else
LOGERROR(L"Invalid attribute value <file filter='%hs'>", v.c_str());
LOGERROR("Invalid attribute value <file filter='%hs'>", v.c_str());
}
else if (attr.Name == at_kaiserwidth)
{
@@ -212,7 +212,7 @@ CTextureConverter::SettingsFile* CTextureConverter::LoadSettings(const VfsPath&
}
else
{
LOGERROR(L"Invalid attribute name <file %hs='...'>", XeroFile.GetAttributeString(attr.Name).c_str());
LOGERROR("Invalid attribute name <file %hs='...'>", XeroFile.GetAttributeString(attr.Name).c_str());
}
}
@@ -326,14 +326,14 @@ bool CTextureConverter::ConvertTexture(const CTexturePtr& texture, const VfsPath
size_t fileSize;
if (m_VFS->LoadFile(src, file, fileSize) < 0)
{
LOGERROR(L"Failed to load texture \"%ls\"", src.string().c_str());
LOGERROR("Failed to load texture \"%ls\"", src.string().c_str());
return false;
}
Tex tex;
if (tex.decode(file, fileSize) < 0)
{
LOGERROR(L"Failed to decode texture \"%ls\"", src.string().c_str());
LOGERROR("Failed to decode texture \"%ls\"", src.string().c_str());
return false;
}
@@ -345,7 +345,7 @@ bool CTextureConverter::ConvertTexture(const CTexturePtr& texture, const VfsPath
// Convert to uncompressed 8-bit with no mipmaps
if (tex.transform_to((tex.m_Flags | TEX_GREY) & ~(TEX_DXT | TEX_MIPMAPS | TEX_ALPHA)) < 0)
{
LOGERROR(L"Failed to transform texture \"%ls\"", src.string().c_str());
LOGERROR("Failed to transform texture \"%ls\"", src.string().c_str());
return false;
}
}
@@ -356,14 +356,14 @@ bool CTextureConverter::ConvertTexture(const CTexturePtr& texture, const VfsPath
// (plain_transform doesn't know how to construct the alpha channel)
if (tex.m_Flags & TEX_GREY)
{
LOGERROR(L"Failed to convert grayscale texture \"%ls\" - only RGB textures are currently supported", src.string().c_str());
LOGERROR("Failed to convert grayscale texture \"%ls\" - only RGB textures are currently supported", src.string().c_str());
return false;
}
// Convert to uncompressed BGRA with no mipmaps
if (tex.transform_to((tex.m_Flags | TEX_BGR | TEX_ALPHA) & ~(TEX_DXT | TEX_MIPMAPS)) < 0)
{
LOGERROR(L"Failed to transform texture \"%ls\"", src.string().c_str());
LOGERROR("Failed to transform texture \"%ls\"", src.string().c_str());
return false;
}
}
@@ -482,7 +482,7 @@ bool CTextureConverter::ConvertTexture(const CTexturePtr& texture, const VfsPath
return true;
#else
LOGERROR(L"Failed to convert texture \"%ls\" (NVTT not available)", src.string().c_str());
LOGERROR("Failed to convert texture \"%ls\" (NVTT not available)", src.string().c_str());
return false;
#endif
}