mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-10-14 07:17:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace usage of CParser for CColor.

Browse Source 
Switches format to use integers only.
Adds logging if the string is invalid.
Refs #2589.

This was SVN commit r15278.
This commit is contained in:
leper
2014-06-04 00:58:05 +00:00
parent db39d742f0
commit 2c14d94559
6 changed files with 126 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/gui/CGUI.cpp
+2 -2
View File
@@ -1687,7 +1687,7 @@ void CGUI::Xeromyces_ReadEffects(XMBElement Element, CXeromyces* pFile, SGUIImag
if (attr_name == "add_color")
{
CColor color;
if (!GUI<int>::ParseColor(attr_value, color, 0.f))
if (!GUI<int>::ParseColor(attr_value, color, 0))
LOGERROR(L"GUI: Error parsing '%hs' (\"%ls\")", attr_name.c_str(), attr_value.c_str());
else effects.m_AddColor = color;
}
@@ -1933,7 +1933,7 @@ void CGUI::Xeromyces_ReadColor(XMBElement Element, CXeromyces* pFile)
if (! value.empty())
{
// Try setting color to value
if (!color.ParseString(value, 255.f))
if (!color.ParseString(value))
{
LOGERROR(L"GUI: Unable to create custom color '%hs'. Invalid color syntax.", name.c_str());
}