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

Changed the add_color GUI sprite effect to use alpha=0 by default

Browse Source 
This was SVN commit r1625.
This commit is contained in:
Ykkrosh
2005-01-03 22:23:27 +00:00
parent 0a99e2a189
commit 31f0e62c83
3 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/gui/CGUI.cpp
+5 -4
View File
@@ -1548,16 +1548,17 @@ void CGUI::Xeromyces_ReadEffects(XMBElement Element, CXeromyces* pFile, SGUIImag
CStr attr_name (pFile->getAttributeString(attr.Name));
CStr attr_value (attr.Value);
#define COLOR(xml, mem) \
#define COLOR(xml, mem, alpha) \
if (attr_name == xml) \
{ \
CColor color; \
if (!GUI<CColor>::ParseString(attr_value, color)) \
if (!GUI<int>::ParseColor(attr_value, color, alpha)) \
ReportParseError("Error parsing '%s' (\"%s\")", attr_name.c_str(), attr_value.c_str()); \
else effects.m_##mem = color; \
} \
else
#define BOOL(xml, mem) \
if (attr_name == xml) \
{ \
@@ -1565,8 +1566,8 @@ void CGUI::Xeromyces_ReadEffects(XMBElement Element, CXeromyces* pFile, SGUIImag
} \
else
COLOR("add_color", AddColor)
COLOR("multiply_color", MultiplyColor)
COLOR("add_color", AddColor, 0.f)
COLOR("multiply_color", MultiplyColor, 255.f)
BOOL("grayscale", Greyscale)
{