Remove bogus assert

[supertux.git] / src / video / color.hpp

diff --git a/src/video/color.hpp b/src/video/color.hpp
index a3c360e..9155157 100644 (file)
--- a/src/video/color.hpp
+++ b/src/video/color.hpp
@@ -26,16 +26,16 @@ class Color
 {
 public:
   Color() :
-    red(0), 
-    green(0), 
-    blue(0), 
+    red(0),
+    green(0),
+    blue(0),
     alpha(1.0f)
   {}
 
   Color(float red_, float green_, float blue_, float alpha_ = 1.0) :
     red(red_),
-    green(green_), 
-    blue(blue_), 
+    green(green_),
+    blue(blue_),
     alpha(alpha_)
   {
     assert(0 <= red   && red <= 1.0);
@@ -70,7 +70,7 @@ public:
 
   float greyscale() const
   {
-    return red * 0.30 + green * 0.59 + blue * 0.11;
+    return red * 0.30f + green * 0.59f + blue * 0.11f;
   }
 
   bool operator < (const Color& other) const