Removed trailing whitespace from all *.?pp files
[supertux.git] / src / object / floating_text.cpp
index bf32552..c9f83b3 100644 (file)
 #include "supertux/resources.hpp"
 #include "video/drawing_context.hpp"
 
-FloatingText::FloatingText(const Vector& pos, const std::string& text_)
-  : position(pos), text(text_)
+FloatingText::FloatingText(const Vector& pos, const std::string& text_) :
+  position(pos),
+  text(text_),
+  timer()
 {
   timer.start(.1f);
   position.x -= text.size() * 8;
 }
 
-FloatingText::FloatingText(const Vector& pos, int score)
-  : position(pos)
+FloatingText::FloatingText(const Vector& pos, int score) :
+  position(pos),
+  text(),
+  timer()
 {
   timer.start(.1f);
 
@@ -65,7 +69,7 @@ FloatingText::draw(DrawingContext& context)
   context.push_transform();
   context.set_alpha(alpha);
 
-  context.draw_text(normal_font, text, position, ALIGN_LEFT, LAYER_OBJECTS+1, FloatingText::text_color);
+  context.draw_text(Resources::normal_font, text, position, ALIGN_LEFT, LAYER_OBJECTS+1, FloatingText::text_color);
 
   context.pop_transform();
 }