// 02111-1307, USA.
#include <iostream>
+#include <sstream>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#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"
static Timer random_timer;
static int frame;
-static unsigned int last_update_time;
-static unsigned int update_time;
static GameSession* titlesession;
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();
/* --- 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);
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. */
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 );
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())
{
titlesession->get_current_sector()->activate();
titlesession->set_current();
//titletux.level_begin();
- update_time = Ticks::get();
+ frame_rate.update();
}
}
else if(menu == contrib_menu)
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++;