// 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"
#include "special/base.h"
#include "app/gettext.h"
#include "misc.h"
+#include "camera.h"
static Surface* bkg_title;
static Surface* logo;
static Timer random_timer;
static int frame;
-static unsigned int last_update_time;
-static unsigned int update_time;
static GameSession* titlesession;
void generate_contrib_menu()
{
-
/** Generating contrib levels list by making use of Level Subset */
std::set<std::string> level_subsets = FileSystem::dsubdirs("/levels", "info");
contrib_menu->additem(MN_LABEL,_("Contrib Levels"),0,0);
contrib_menu->additem(MN_HL,"",0,0);
-
int i = 0;
for (std::set<std::string>::iterator it = level_subsets.begin(); it != level_subsets.end(); ++it)
{
LevelSubset* subset = new LevelSubset();
- subset->load((*it).c_str());
- contrib_menu->additem(MN_GOTO, subset->title.c_str(), i,
- contrib_subset_menu);
+ subset->load(*it);
+ contrib_menu->additem(MN_GOTO, subset->title, 0, contrib_subset_menu, i);
contrib_subsets.push_back(subset);
++i;
}
- i = 0;
+ i = level_subsets.size();
for(std::set<std::string>::iterator it = worldmap_list.begin(); it != worldmap_list.end(); ++it)
{
WorldMapNS::WorldMap worldmap;
worldmap.loadmap((*it).c_str());
- contrib_menu->additem(MN_ACTION, worldmap.get_world_title(),0,0, i + level_subsets.size());
+ contrib_menu->additem(MN_ACTION, worldmap.get_world_title(),0,0, i);
++i;
}
current_subset = index;
// FIXME: This shouln't be busy looping
LevelSubset& subset = * (contrib_subsets[index]);
-
+
current_contrib_subset = ⊂
contrib_subset_menu->clear();
contrib_subset_menu->additem(MN_LABEL, subset.title, 0,0);
contrib_subset_menu->additem(MN_HL,"",0,0);
-
+
for (int i = 0; i < subset.get_num_levels(); ++i)
{
/** get level's title */
if(!reader)
{
std::cerr << "Error: Could not open level file. Ignoring...\n";
- return;
+ continue;
}
reader->read_string("name", level_title, true);
std::set<std::string>::iterator it = worldmap_list.begin();
for(int i = index - contrib_subsets.size(); i > 0; --i)
++it;
- worldmap.loadmap((*it));
- worldmap.display();
+
+ std::string map_filename = *it;
+
+ worldmap.set_map_filename(map_filename);
+
+ // hack to erase the extension
+ unsigned int ext_pos = it->find_last_of(".");
+ if(ext_pos != std::string::npos)
+ map_filename.erase(ext_pos, map_filename.size() - ext_pos);
+
+ // TODO: slots should be available for contrib maps
+ worldmap.loadgame(st_save_dir + "/" + map_filename + "-slot1.stsg");
+
+ worldmap.display(); // run the map
Menu::set_current(main_menu);
}
if(world->solids->get_width() * 32 - 320 < tux->base.x)
{
tux->level_begin();
+ world->camera->reset(Vector(tux->base.x, tux->base.y));
}
tux->can_jump = true;
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. */
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();
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++;
projects / supertux.git / blobdiff