elexis
e1014aad3b
Remove the remaining of such checks afterd3e56f0f57
removed 21 of them already.2c47fbd66a
initialized the pointer at construction time rather than at random conditional events later. Differential Revision: https://code.wildfiregames.com/D2205 Comments By: Vladislav, wraitii Tested on: gcc 9.1.0, clang 8.0.1 This was SVN commit r22741.
40 lines
1.1 KiB
C++
40 lines
1.1 KiB
C++
/* Copyright (C) 2019 Wildfire Games.
|
|
* This file is part of 0 A.D.
|
|
*
|
|
* 0 A.D. is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* 0 A.D. is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with 0 A.D. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "precompiled.h"
|
|
|
|
#include "CGUIColor.h"
|
|
#include "ps/CStr.h"
|
|
#include "gui/CGUI.h"
|
|
|
|
bool CGUIColor::ParseString(const CGUI& pGUI, const CStr& value, int defaultAlpha)
|
|
{
|
|
if (pGUI.HasPreDefinedColor(value))
|
|
{
|
|
const CGUIColor& color = pGUI.GetPreDefinedColor(value);
|
|
|
|
// Explicit copy assignment
|
|
r = color.r;
|
|
g = color.g;
|
|
b = color.b;
|
|
a = color.a;
|
|
return true;
|
|
}
|
|
|
|
return CColor::ParseString(value, defaultAlpha);
|
|
}
|