diff options
Diffstat (limited to 'src/guichan/color.cpp')
| -rw-r--r-- | src/guichan/color.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/guichan/color.cpp b/src/guichan/color.cpp index 15f9ea0ee..5122e94b0 100644 --- a/src/guichan/color.cpp +++ b/src/guichan/color.cpp @@ -49,35 +49,35 @@ namespace gcn { - Color::Color() - : r(0), - g(0), - b(0), - a(255) + Color::Color() : + r(0), + g(0), + b(0), + a(255) { } - Color::Color(int color) - : r( (color >> 16) & 0xFF), - g( (color >> 8) & 0xFF), - b( color & 0xFF), + Color::Color(int color) : + r((color >> 16) & 0xFF), + g((color >> 8) & 0xFF), + b(color & 0xFF), a(255) { } - Color::Color(int ar, int ag, int ab, int aa) - : r(ar), - g(ag), - b(ab), - a(aa) + Color::Color(int ar, int ag, int ab, int aa) : + r(ar), + g(ag), + b(ab), + a(aa) { } Color Color::operator+(const Color& color) const { - Color result(r + color.r, - g + color.g, - b + color.b, + Color result(r + color.r, + g + color.g, + b + color.b, 255); result.r = (result.r>255?255:(result.r<0?0:result.r)); @@ -125,7 +125,7 @@ namespace gcn return !(r == color.r && g == color.g && b == color.b && a == color.a); } - std::ostream& operator<<(std::ostream& out, + std::ostream& operator<<(std::ostream& out, const Color& color) { out << "Color [r = " |