X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftitle.cpp;h=69fdb798b7398ae63e6aa578ab406f7792e18d6a;hb=07a60074d2369ec9f49754f15277f5242482df84;hp=5d195206ba8e8dd7b39c288b80badfcd20706e03;hpb=88098c1f5b05cb33f23605319ffef800319bca5f;p=supertux.git diff --git a/src/title.cpp b/src/title.cpp index 5d195206b..69fdb798b 100644 --- a/src/title.cpp +++ b/src/title.cpp @@ -20,6 +20,7 @@ // 02111-1307, USA. #include +#include #include #include #include @@ -35,14 +36,15 @@ #endif #include "defines.h" -#include "globals.h" +#include "app/globals.h" #include "title.h" -#include "screen/screen.h" -#include "screen/surface.h" +#include "video/screen.h" +#include "video/surface.h" #include "high_scores.h" -#include "menu.h" -#include "timer.h" -#include "setup.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 "gameloop.h" @@ -54,8 +56,9 @@ #include "sector.h" #include "tilemap.h" #include "resources.h" -#include "type.h" -#include "gettext.h" +#include "special/base.h" +#include "app/gettext.h" +#include "misc.h" static Surface* bkg_title; static Surface* logo; @@ -65,18 +68,28 @@ static bool walking; static Timer random_timer; static int frame; -static unsigned int last_update_time; -static unsigned int update_time; static GameSession* titlesession; static std::vector contrib_subsets; static LevelSubset* current_contrib_subset = 0; -static string_list_type worldmap_list; +static std::set worldmap_list; static LevelEditor* leveleditor; +void update_load_save_game_menu(Menu* pmenu) +{ + for(int i = 2; i < 7; ++i) + { + // FIXME: Insert a real savegame struct/class here instead of + // doing string vodoo + std::string tmp = slotinfo(i - 1); + pmenu->item[i].kind = MN_ACTION; + pmenu->item[i].change_text(tmp.c_str()); + } +} + void free_contrib_menu() { for(std::vector::iterator i = contrib_subsets.begin(); @@ -89,34 +102,39 @@ void free_contrib_menu() void generate_contrib_menu() { + /** Generating contrib levels list by making use of Level Subset */ - string_list_type level_subsets = dsubdirs("/levels", "info"); + std::set level_subsets = FileSystem::dsubdirs("/levels", "info"); free_contrib_menu(); contrib_menu->additem(MN_LABEL,_("Contrib Levels"),0,0); contrib_menu->additem(MN_HL,"",0,0); - - for (int i = 0; i < level_subsets.num_items; ++i) + + int i = 0; + for (std::set::iterator it = level_subsets.begin(); it != level_subsets.end(); ++it) { LevelSubset* subset = new LevelSubset(); - subset->load(level_subsets.item[i]); + subset->load((*it).c_str()); contrib_menu->additem(MN_GOTO, subset->title.c_str(), i, - contrib_subset_menu, i); + contrib_subset_menu); contrib_subsets.push_back(subset); + ++i; } - for(int i = 0; i < worldmap_list.num_items; i++) + i = 0; + for(std::set::iterator it = worldmap_list.begin(); it != worldmap_list.end(); ++it) { WorldMapNS::WorldMap worldmap; - worldmap.loadmap(worldmap_list.item[i]); - contrib_menu->additem(MN_ACTION, worldmap.get_world_title(),0,0, i + level_subsets.num_items); + worldmap.loadmap((*it).c_str()); + contrib_menu->additem(MN_ACTION, worldmap.get_world_title(),0,0, i + level_subsets.size()); + ++i; } contrib_menu->additem(MN_HL,"",0,0); contrib_menu->additem(MN_BACK,_("Back"),0,0); - string_list_free(&level_subsets); + level_subsets.clear(); } void check_levels_contrib_menu() @@ -144,10 +162,20 @@ void check_levels_contrib_menu() for (int i = 0; i < subset.get_num_levels(); ++i) { - Level* level = new Level; - level->load(subset.get_level_filename(i)); - contrib_subset_menu->additem(MN_ACTION, level->get_name(), 0, 0, i); - delete level; + /** get level's title */ + std::string level_title = ""; + + LispReader* reader = LispReader::load(subset.get_level_filename(i), "supertux-level"); + if(!reader) + { + std::cerr << "Error: Could not open level file. Ignoring...\n"; + return; + } + + reader->read_string("name", level_title, true); + delete reader; + + contrib_subset_menu->additem(MN_ACTION, level_title, 0, 0, i); } contrib_subset_menu->additem(MN_HL,"",0,0); @@ -157,10 +185,13 @@ void check_levels_contrib_menu() titlesession->set_current(); } } - else if(index < worldmap_list.num_items + (int)contrib_subsets.size()) + else if((unsigned)index < worldmap_list.size() + (int)contrib_subsets.size()) { WorldMapNS::WorldMap worldmap; - worldmap.loadmap(worldmap_list.item[index - contrib_subsets.size()]); + std::set::iterator it = worldmap_list.begin(); + for(int i = index - contrib_subsets.size(); i > 0; --i) + ++it; + worldmap.loadmap((*it)); worldmap.display(); Menu::set_current(main_menu); @@ -239,7 +270,7 @@ void title(void) walking = true; - st_pause_ticks_init(); + Ticks::pause_init(); titlesession = new GameSession(datadir + "/levels/misc/menu.stl", ST_GL_DEMO_GAME); @@ -249,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 = dfiles("levels/worldmap", NULL, "icyisland.stwm"); + worldmap_list = FileSystem::dfiles("levels/worldmap", "", "icyisland.stwm"); titlesession->get_current_sector()->activate(); titlesession->set_current(); @@ -257,7 +288,9 @@ void title(void) /* --- Main title loop: --- */ frame = 0; - update_time = st_get_ticks(); + FrameRate frame_rate(100); + frame_rate.set_frame_limit(false); + random_timer.start(rand() % 2000 + 2000); Menu::set_current(main_menu); @@ -265,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 = st_get_ticks(); - + 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. */ @@ -286,20 +319,21 @@ void title(void) if (event.type == SDL_QUIT) Menu::set_current(0); } - + /* Draw the background: */ draw_demo(frame_ratio); - + + if (Menu::current() == main_menu) 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(); @@ -307,7 +341,7 @@ void title(void) { menu->draw(context); menu->action(); - + if(menu == main_menu) { switch (main_menu->check()) @@ -326,10 +360,10 @@ void title(void) leveleditor->run(); delete leveleditor; Menu::set_current(main_menu); - update_time = st_get_ticks(); + frame_rate.update(); break; case MNID_CREDITS: - display_text_file("CREDITS", SCROLL_SPEED_CREDITS); + display_text_file("CREDITS", SCROLL_SPEED_CREDITS, white_big_text , white_text, white_small_text, blue_text ); Menu::set_current(main_menu); break; case MNID_QUITMAINMENU: @@ -346,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 = st_get_ticks(); + frame_rate.update(); } else if (process_load_game_menu()) { @@ -366,7 +401,7 @@ void title(void) titlesession->get_current_sector()->activate(); titlesession->set_current(); //titletux.level_begin(); - update_time = st_get_ticks(); + frame_rate.update(); } } else if(menu == contrib_menu) @@ -383,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 = st_get_ticks(); + frame_rate.update(); /* Pause: */ frame++; @@ -394,12 +427,13 @@ void title(void) /* Free surfaces: */ free_contrib_menu(); - string_list_free(&worldmap_list); + worldmap_list.clear(); delete titlesession; delete bkg_title; delete logo; delete img_choose_subset; } + // EOF //