diff options
author | Andrei Karas <akaras@inbox.ru> | 2012-02-22 19:50:00 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2012-02-22 22:33:52 +0300 |
commit | a8d90b8a84b5a21c53fb5d279dc983ae1e2c3217 (patch) | |
tree | f1e35affbe927a1e81fcfafe91747fe3c1e3f56d /src/guichan/color.cpp | |
parent | 3e75f388c21a7c9a00ef2ff802023be00431248a (diff) | |
download | plus-a8d90b8a84b5a21c53fb5d279dc983ae1e2c3217.tar.gz plus-a8d90b8a84b5a21c53fb5d279dc983ae1e2c3217.tar.bz2 plus-a8d90b8a84b5a21c53fb5d279dc983ae1e2c3217.tar.xz plus-a8d90b8a84b5a21c53fb5d279dc983ae1e2c3217.zip |
Fix code style.
Diffstat (limited to 'src/guichan/color.cpp')
-rw-r--r-- | src/guichan/color.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/guichan/color.cpp b/src/guichan/color.cpp index d3dc7a738..f58e7b58e 100644 --- a/src/guichan/color.cpp +++ b/src/guichan/color.cpp @@ -97,23 +97,23 @@ namespace gcn b - color.b, 255); - result.r = (result.r>255?255:(result.r<0?0:result.r)); - result.g = (result.g>255?255:(result.g<0?0:result.g)); - result.b = (result.b>255?255:(result.b<0?0:result.b)); + result.r = (result.r > 255 ? 255 : (result.r < 0 ? 0 : result.r)); + result.g = (result.g > 255 ? 255 : (result.g < 0 ? 0 : result.g)); + result.b = (result.b > 255 ? 255 : (result.b < 0 ? 0 : result.b)); return result; } Color Color::operator*(float value) const { - Color result((int)(r * value), - (int)(g * value), - (int)(b * value), + Color result(static_cast<int>(r * value), + static_cast<int>(g * value), + static_cast<int>(b * value), a); - result.r = (result.r>255?255:(result.r<0?0:result.r)); - result.g = (result.g>255?255:(result.g<0?0:result.g)); - result.b = (result.b>255?255:(result.b<0?0:result.b)); + result.r = (result.r > 255 ? 255 : (result.r < 0 ? 0 : result.r)); + result.g = (result.g > 255 ? 255 : (result.g < 0 ? 0 : result.g)); + result.b = (result.b > 255 ? 255 : (result.b < 0 ? 0 : result.b)); return result; } |