X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Flevelintro.cpp;h=5662a3093bcf474114a62804481cb6ab68b4e836;hb=657fc40723665c04b3150946f5bd66b6b0af9230;hp=097fceea97db30999822bbd9820fc53bab98849b;hpb=d83146487eca3bb987302662f9acd0af13572ce5;p=supertux.git

diff --git a/src/levelintro.cpp b/src/levelintro.cpp
index 097fceea9..5662a3093 100644
--- a/src/levelintro.cpp
+++ b/src/levelintro.cpp
@@ -1,4 +1,4 @@
-//  $Id: textscroller.cpp 4981 2007-04-15 15:41:27Z sommer $
+//  $Id$
 //
 //  SuperTux -- LevelIntro screen
 //  Copyright (C) 2008 Christoph Sommer <christoph.sommer@2008.expires.deltadevelopment.de>
@@ -26,7 +26,6 @@
 #include "mainloop.hpp"
 #include "gettext.hpp"
 #include "resources.hpp"
-#include "video/font.hpp"
 #include "video/drawing_context.hpp"
 #include "gui/menu.hpp"
 #include "main.hpp"
@@ -35,12 +34,6 @@
 #include "sprite/sprite_manager.hpp"
 #include "random_generator.hpp"
 
-
-static const float DEFAULT_SPEED = 20;
-static const float LEFT_BORDER = 50;
-static const float SCROLL = 60;
-static const float ITEMS_SPACE = 4;
-
 LevelIntro::LevelIntro(const Level* level, const Statistics* best_level_statistics)
         : level(level), best_level_statistics(best_level_statistics), player_sprite_py(0), player_sprite_vy(0)
 {
@@ -56,7 +49,6 @@ LevelIntro::~LevelIntro()
 void
 LevelIntro::setup()
 {
-  Menu::set_current(NULL);
 }
 
 void
@@ -88,58 +80,55 @@ void
 LevelIntro::draw(DrawingContext& context)
 {
   const Statistics& stats = level->stats;
-  int py = SCREEN_HEIGHT / 2 - gold_text->get_height() / 2;
+  int py = static_cast<int>(SCREEN_HEIGHT / 2 - normal_font->get_height() / 2);
 
   context.draw_filled_rect(Vector(0, 0), Vector(SCREEN_WIDTH, SCREEN_HEIGHT), Color(0.0f, 0.0f, 0.0f, 1.0f), 0);
 
   {
-    context.draw_center_text(gold_text, level->get_name(), Vector(0, py), LAYER_FOREGROUND1);
-    py += gold_text->get_height();
+    context.draw_center_text(normal_font, level->get_name(), Vector(0, py), LAYER_FOREGROUND1, LevelIntro::header_color);
+    py += static_cast<int>(normal_font->get_height());
   }
 
   std::string author = level->get_author();
   if ((author != "") && (author != "SuperTux Team")) {
     std::string author_text = std::string(_("contributed by ")) + author;
-    context.draw_center_text(white_small_text, author_text, Vector(0, py), LAYER_FOREGROUND1);
-    py += white_small_text->get_height();
+    context.draw_center_text(small_font, author_text, Vector(0, py), LAYER_FOREGROUND1, LevelIntro::author_color);
+    py += static_cast<int>(small_font->get_height());
   }
 
   py += 32;
 
   {
     player_sprite->draw(context, Vector((SCREEN_WIDTH - player_sprite->get_current_hitbox_width()) / 2, py + player_sprite_py), LAYER_FOREGROUND1);
-    py += player_sprite->get_current_hitbox_height();
+    py += static_cast<int>(player_sprite->get_current_hitbox_height());
   }
 
   py += 32;
 
   {
-    context.draw_center_text(blue_text, std::string("- ") + _("Best Level Statistics") + std::string(" -"), Vector(0, py), LAYER_FOREGROUND1);
-    py += blue_text->get_height();
+    context.draw_center_text(normal_font, std::string("- ") + _("Best Level Statistics") + std::string(" -"), Vector(0, py), LAYER_FOREGROUND1, LevelIntro::stat_hdr_color);
+    py += static_cast<int>(normal_font->get_height());
   }
 
   {
     std::stringstream ss;
     ss << _("Coins") << ": " << Statistics::coins_to_string((best_level_statistics && (best_level_statistics->coins >= 0)) ? best_level_statistics->coins : 0, stats.total_coins);
-    context.draw_center_text(white_text, ss.str(), Vector(0, py), LAYER_FOREGROUND1);
-    py += white_text->get_height();
+    context.draw_center_text(normal_font, ss.str(), Vector(0, py), LAYER_FOREGROUND1, LevelIntro::stat_color);
+    py += static_cast<int>(normal_font->get_height());
   }
   
   {
     std::stringstream ss;
     ss << _("Secrets") << ": " << Statistics::secrets_to_string((best_level_statistics && (best_level_statistics->coins >= 0)) ? best_level_statistics->secrets : 0, stats.total_secrets);
-    context.draw_center_text(white_text, ss.str(), Vector(0, py), LAYER_FOREGROUND1);
-    py += white_text->get_height();
+    context.draw_center_text(normal_font, ss.str(), Vector(0, py), LAYER_FOREGROUND1,LevelIntro::stat_color);
+    py += static_cast<int>(normal_font->get_height());
   }
 
   {
     std::stringstream ss;
     ss << _("Time") << ": " << Statistics::time_to_string((best_level_statistics && (best_level_statistics->coins >= 0)) ? best_level_statistics->time : 0);
-    context.draw_center_text(white_text, ss.str(), Vector(0, py), LAYER_FOREGROUND1);
-    py += white_text->get_height();
+    context.draw_center_text(normal_font, ss.str(), Vector(0, py), LAYER_FOREGROUND1,LevelIntro::stat_color);
+    py += static_cast<int>(normal_font->get_height());
   }
 
-  py += 32;
-
-
 }