X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftitle.cpp;h=fe63a48f0eb9b51531335efd77c5a4df7a77152f;hb=cd45589a277cdad80dad52ff16545d1d01352283;hp=77b00a99f60509f9a40a0473f97e7a2e6348e229;hpb=fc607f09216470a3ac761b8e9c50f7dcb40eccfe;p=supertux.git diff --git a/src/title.cpp b/src/title.cpp index 77b00a99f..fe63a48f0 100644 --- a/src/title.cpp +++ b/src/title.cpp @@ -74,10 +74,11 @@ static GameSession* titlesession; static std::vector contrib_subsets; static LevelSubset* current_contrib_subset = 0; +static int first_level_index; static std::set worldmap_list; -static LevelEditor* leveleditor; +static FrameRate frame_rate(100); void update_load_save_game_menu(Menu* pmenu) { @@ -111,16 +112,7 @@ void generate_contrib_menu() contrib_menu->additem(MN_LABEL,_("Contrib Levels"),0,0); contrib_menu->additem(MN_HL,"",0,0); int i = 0; - for (std::set::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, 0, contrib_subset_menu, i); - contrib_subsets.push_back(subset); - ++i; - } - i = level_subsets.size(); for(std::set::iterator it = worldmap_list.begin(); it != worldmap_list.end(); ++it) { WorldMapNS::WorldMap worldmap; @@ -130,6 +122,23 @@ void generate_contrib_menu() } contrib_menu->additem(MN_HL,"",0,0); + + first_level_index = i; + for (std::set::iterator it = level_subsets.begin(); it != level_subsets.end(); ++it) + { + LevelSubset* subset = new LevelSubset(); + subset->load(*it); + if(subset->hide_from_contribs) + { + delete subset; + continue; + } + contrib_menu->additem(MN_GOTO, subset->title, 0, contrib_subset_menu, i); + contrib_subsets.push_back(subset); + ++i; + } + + contrib_menu->additem(MN_HL,"",0,0); contrib_menu->additem(MN_BACK,_("Back"),0,0); level_subsets.clear(); @@ -143,8 +152,32 @@ void check_levels_contrib_menu() if (index == -1) return; - if (index < (int)contrib_subsets.size()) + if((unsigned)index < worldmap_list.size()) + { + WorldMapNS::WorldMap worldmap; + std::set::iterator it = worldmap_list.begin(); + for(int i = index; i > 0; --i) + ++it; + + 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); + } + else if (index < (int)contrib_subsets.size() + first_level_index) { + index -= first_level_index; if (current_subset != index) { current_subset = index; @@ -167,7 +200,7 @@ void check_levels_contrib_menu() if(!reader) { std::cerr << "Error: Could not open level file. Ignoring...\n"; - return; + continue; } reader->read_string("name", level_title, true); @@ -183,29 +216,6 @@ void check_levels_contrib_menu() titlesession->set_current(); } } - else if((unsigned)index < worldmap_list.size() + (int)contrib_subsets.size()) - { - WorldMapNS::WorldMap worldmap; - std::set::iterator it = worldmap_list.begin(); - for(int i = index - contrib_subsets.size(); i > 0; --i) - ++it; - - std::string map_filename = *it; - - worldmap.loadmap(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); - } } void check_contrib_subset_menu() @@ -228,6 +238,20 @@ void check_contrib_subset_menu() } } +/* If the demo was stopped - because game started, level + editor was excuted, etc - call this when you get back + to the title code. + */ +void resume_demo() +{ + // FIXME: shouldn't be needed if GameSession + // didn't relay on global variables + titlesession->get_current_sector()->activate(); + titlesession->set_current(); + + frame_rate.update(); +} + void draw_demo(double frame_ratio) { Sector* world = titlesession->get_current_sector(); @@ -277,10 +301,10 @@ void draw_demo(double frame_ratio) /* --- TITLE SCREEN --- */ void title(void) { - random_timer.init(true); - walking = true; + LevelEditor* leveleditor; + random_timer.init(true); Ticks::pause_init(); titlesession = new GameSession(datadir + "/levels/misc/menu.stl", ST_GL_DEMO_GAME); @@ -299,7 +323,6 @@ void title(void) /* --- Main title loop: --- */ frame = 0; - FrameRate frame_rate(100); frame_rate.set_frame_limit(false); random_timer.start(rand() % 2000 + 2000); @@ -371,7 +394,7 @@ void title(void) leveleditor->run(); delete leveleditor; Menu::set_current(main_menu); - frame_rate.update(); + resume_demo(); break; case MNID_CREDITS: display_text_file("CREDITS", SCROLL_SPEED_CREDITS, white_big_text , white_text, white_small_text, blue_text ); @@ -391,8 +414,8 @@ void title(void) if(event.key.keysym.sym == SDLK_DELETE) { int slot = menu->get_active_item_id(); - std::stringstream stream; - stream << 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.c_str())) @@ -404,15 +427,11 @@ void title(void) update_load_save_game_menu(load_game_menu); Menu::set_current(main_menu); - frame_rate.update(); + resume_demo(); } else if (process_load_game_menu()) { - // FIXME: shouldn't be needed if GameSession doesn't relay on global variables - titlesession->get_current_sector()->activate(); - titlesession->set_current(); - //titletux.level_begin(); - frame_rate.update(); + resume_demo(); } } else if(menu == contrib_menu)