X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftitle.cpp;h=69fdb798b7398ae63e6aa578ab406f7792e18d6a;hb=07a60074d2369ec9f49754f15277f5242482df84;hp=dd720b2842e09402c63da7903139b2ab58b9493e;hpb=6ed1900da4edf7d7922f7a4626f95a83e34dff82;p=supertux.git

diff --git a/src/title.cpp b/src/title.cpp
index dd720b284..69fdb798b 100644
--- a/src/title.cpp
+++ b/src/title.cpp
@@ -20,6 +20,7 @@
 //  02111-1307, USA.
 
 #include <iostream>
+#include <sstream>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -42,6 +43,7 @@
 #include "high_scores.h"
 #include "gui/menu.h"
 #include "special/timer.h"
+#include "special/frame_rate.h"
 #include "app/setup.h"
 #include "level.h"
 #include "level_subset.h"
@@ -66,8 +68,6 @@ static bool walking;
 static Timer random_timer;
 
 static int frame;
-static unsigned int last_update_time;
-static unsigned int update_time;
 
 static GameSession* titlesession;
 
@@ -280,7 +280,7 @@ void title(void)
   img_choose_subset = new Surface(datadir + "/images/status/choose-level-subset.png", true);
 
   /* Generating contrib maps by only using a string_list */
-  worldmap_list = FileSystem::dfiles("levels/worldmap", NULL, "icyisland.stwm");
+  worldmap_list = FileSystem::dfiles("levels/worldmap", "", "icyisland.stwm");
 
   titlesession->get_current_sector()->activate();
   titlesession->set_current();
@@ -288,7 +288,9 @@ void title(void)
   /* --- Main title loop: --- */
   frame = 0;
 
-  update_time = Ticks::get();
+  FrameRate frame_rate(100);  
+  frame_rate.set_frame_limit(false);
+  
   random_timer.start(rand() % 2000 + 2000);
 
   Menu::set_current(main_menu);
@@ -296,11 +298,11 @@ void title(void)
   while (Menu::current())
     {
       // if we spent to much time on a menu entry
-      if( (update_time - last_update_time) > 1000)
-        update_time = last_update_time = Ticks::get();
-
+      frame_rate.smooth_hanger();
+    
       // Calculate the movement-factor
-      double frame_ratio = ((double)(update_time-last_update_time))/((double)FRAME_RATE);
+      double frame_ratio = frame_rate.get();
+      
       if(frame_ratio > 1.5) /* Quick hack to correct the unprecise CPU clocks a little bit. */
         frame_ratio = 1.5 + (frame_ratio - 1.5) * 0.85;
       /* Lower the frame_ratio that Tux doesn't jump to hectically throught the demo. */
@@ -326,12 +328,12 @@ void title(void)
         context.draw_surface(logo, Vector(screen->w/2 - logo->w/2, 30),
             LAYER_FOREGROUND1+1);
 
-      context.draw_text(white_small_text, " SuperTux " VERSION "\n", Vector(0, screen->h - 70), LAYER_FOREGROUND1);
+      context.draw_text(white_small_text, " SuperTux " VERSION "\n", Vector(0, screen->h - 70), LEFT_ALLIGN, LAYER_FOREGROUND1);
       context.draw_text(white_small_text,
         _("Copyright (c) 2003 SuperTux Devel Team\n"
           "This game comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n"
           "are welcome to redistribute it under certain conditions; see the file COPYING\n"
-          "for details.\n"), Vector(0, screen->h - 70 + white_small_text->get_height()), LAYER_FOREGROUND1);
+          "for details.\n"), Vector(0, screen->h - 70 + white_small_text->get_height()), LEFT_ALLIGN, LAYER_FOREGROUND1);
 
       /* Don't draw menu, if quit is true */
       Menu* menu = Menu::current();
@@ -358,7 +360,7 @@ void title(void)
                   leveleditor->run();
                   delete leveleditor;
                   Menu::set_current(main_menu);
-                  update_time = Ticks::get();
+                  frame_rate.update();
                   break;
                 case MNID_CREDITS:
                   display_text_file("CREDITS", SCROLL_SPEED_CREDITS, white_big_text , white_text, white_small_text, blue_text );
@@ -378,19 +380,20 @@ void title(void)
               if(event.key.keysym.sym == SDLK_DELETE)
                 {
                 int slot = menu->get_active_item_id();
-                char str[1024];
-                sprintf(str,_("Are you sure you want to delete slot %d?"), slot);
+		std::stringstream stream;
+		stream << slot;
+                std::string str = _("Are you sure you want to delete slot") + stream.str() + "?";
                 
-                if(confirm_dialog(bkg_title, str))
+                if(confirm_dialog(bkg_title, str.c_str()))
                   {
-                  sprintf(str,"%s/slot%d.stsg", st_save_dir, slot);
-                  printf("Removing: %s\n",str);
-                  remove(str);
+                  str = st_save_dir + "/slot" + stream.str() + ".stsg";
+                  printf("Removing: %s\n",str.c_str());
+                  remove(str.c_str());
                   }
 
                 update_load_save_game_menu(load_game_menu);
                 Menu::set_current(main_menu);
-                update_time = Ticks::get();
+                frame_rate.update();
                 }
               else if (process_load_game_menu())
                 {
@@ -398,7 +401,7 @@ void title(void)
                   titlesession->get_current_sector()->activate();
                   titlesession->set_current();
                   //titletux.level_begin();
-                  update_time = Ticks::get();
+                  frame_rate.update();
                 }
             }
           else if(menu == contrib_menu)
@@ -415,9 +418,7 @@ void title(void)
      
       context.do_drawing();
 
-      /* Set the time of the last update and the time of the current update */
-      last_update_time = update_time;
-      update_time = Ticks::get();
+      frame_rate.update();
 
       /* Pause: */
       frame++;