X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftitle.cpp;h=61276638008898cbe02a9af81d3c7499735f295c;hb=1cd7104259878cd6afbc257a452a1ab1456d4120;hp=120935b6dc26ee5b003cc8758fd3ea4c7858c66d;hpb=63ca854a3bacef4f6df088a0af5f629c89000018;p=supertux.git diff --git a/src/title.cpp b/src/title.cpp index 120935b6d..612766380 100644 --- a/src/title.cpp +++ b/src/title.cpp @@ -32,7 +32,9 @@ #include #include #include +#include +#include "gameconfig.hpp" #include "title.hpp" #include "mainloop.hpp" #include "video/drawing_context.hpp" @@ -79,15 +81,6 @@ enum MainMenuIDs { void TitleScreen::update_load_game_menu() { - load_game_menu.reset(new Menu()); - - load_game_menu->add_label(_("Start Game")); - load_game_menu->add_hl(); - for(int i = 1; i <= 5; ++i) { - load_game_menu->add_entry(i, get_slotinfo(i)); - } - load_game_menu->add_hl(); - load_game_menu->add_back(_("Back")); } void @@ -172,8 +165,7 @@ TitleScreen::check_levels_contrib_menu() current_world = contrib_worlds[index]; if(!current_world->is_levelset) { - update_load_game_menu(); - Menu::push_current(load_game_menu.get()); + start_game(); } else { contrib_world_menu.reset(new Menu()); @@ -296,10 +288,15 @@ TitleScreen::check_addons_menu() // check if "Check Online" was chosen if (index == 0) { - available_addons = AddonManager::get_instance().get_available_addons(); - generate_addons_menu(); - Menu::set_current(addons_menu.get()); - addons_menu->set_active_item(index); + try { + available_addons = AddonManager::get_instance().get_available_addons(); + generate_addons_menu(); + Menu::set_current(addons_menu.get()); + addons_menu->set_active_item(index); + } + catch (std::runtime_error e) { + log_warning << "Check for available Add-ons failed: " << e.what() << std::endl; + } return; } @@ -307,15 +304,27 @@ TitleScreen::check_addons_menu() if ((index >= ADDON_LIST_START_ID) && (index < ADDON_LIST_START_ID) + addons.size()) { Addon addon = addons[index - ADDON_LIST_START_ID]; if (!addon.isInstalled) { - addon.install(); - generate_addons_menu(); - Menu::set_current(addons_menu.get()); - addons_menu->set_active_item(index); + try { + addon.install(); + //generate_addons_menu(); + //Menu::set_current(addons_menu.get()); + //addons_menu->set_active_item(index); + Menu::set_current(0); + } + catch (std::runtime_error e) { + log_warning << "Installation of Add-on failed: " << e.what() << std::endl; + } } else { - addon.remove(); - generate_addons_menu(); - Menu::set_current(addons_menu.get()); - addons_menu->set_active_item(index); + try { + addon.remove(); + //generate_addons_menu(); + //Menu::set_current(addons_menu.get()); + //addons_menu->set_active_item(index); + Menu::set_current(0); + } + catch (std::runtime_error e) { + log_warning << "Removal of Add-on failed: " << e.what() << std::endl; + } } } @@ -363,6 +372,14 @@ TitleScreen::TitleScreen() player->set_controller(controller.get()); player->set_speedlimit(230); //MAX_WALK_XM + generate_main_menu(); + + frame = std::auto_ptr(new Surface("images/engine/menu/frame.png")); +} + +void +TitleScreen::generate_main_menu() +{ main_menu.reset(new Menu()); main_menu->set_pos(SCREEN_WIDTH/2, SCREEN_HEIGHT/2 + 35); main_menu->add_entry(MNID_STARTGAME, _("Start Game")); @@ -405,6 +422,9 @@ TitleScreen::draw(DrawingContext& context) Sector* sector = titlesession->get_current_sector(); sector->draw(context); + // FIXME: Add something to scale the frame to the resolution of the screen + context.draw_surface(frame.get(), Vector(0,0),LAYER_FOREGROUND1); + context.draw_text(white_small_text, "SuperTux " PACKAGE_VERSION "\n", Vector(5, SCREEN_HEIGHT - 50), ALIGN_LEFT, LAYER_FOREGROUND1); context.draw_text(white_small_text, @@ -439,45 +459,31 @@ TitleScreen::update(float elapsed_time) main_world->load("levels/world1/info"); } current_world = main_world.get(); - update_load_game_menu(); - Menu::push_current(load_game_menu.get()); + start_game(); break; + case MNID_LEVELS_CONTRIB: // Contrib Menu generate_contrib_menu(); Menu::push_current(contrib_menu.get()); break; + case MNID_ADDONS: // Add-ons Menu generate_addons_menu(); Menu::push_current(addons_menu.get()); break; + case MNID_CREDITS: main_loop->push_screen(new TextScroller("credits.txt"), new FadeOut(0.5)); break; + case MNID_QUITMAINMENU: main_loop->quit(new FadeOut(0.25)); + sound_manager->stop_music(0.25); break; } - } else if(menu == load_game_menu.get()) { - /* - if(event.key.keysym.sym == SDLK_DELETE) { - int slot = menu->get_active_item_id(); - 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())) { - str = "save/slot" + stream.str() + ".stsg"; - log_debug << "Removing: " << str << std::endl; - PHYSFS_delete(str.c_str()); - } - - update_load_save_game_menu(load_game_menu); - Menu::set_current(main_menu.get()); - }*/ - process_load_game_menu(); } else if(menu == contrib_menu.get()) { check_levels_contrib_menu(); } else if(menu == addons_menu.get()) { @@ -490,59 +496,19 @@ TitleScreen::update(float elapsed_time) // reopen menu of user closed it (so that the app doesn't close when user // accidently hit ESC) if(Menu::current() == 0) { + generate_main_menu(); Menu::set_current(main_menu.get()); } } -std::string -TitleScreen::get_slotinfo(int slot) +void +TitleScreen::start_game() { - std::string tmp; - std::string title; - std::string basename = current_world->get_basedir(); basename = basename.substr(0, basename.length()-1); std::string worlddirname = FileSystem::basename(basename); std::ostringstream stream; - stream << "save/" << worlddirname << "_" << slot << ".stsg"; - std::string slotfile = stream.str(); - - try { - lisp::Parser parser; - const lisp::Lisp* root = parser.parse(slotfile); - - const lisp::Lisp* savegame = root->get_lisp("supertux-savegame"); - if(!savegame) - throw std::runtime_error("file is not a supertux-savegame."); - - savegame->get("title", title); - } catch(std::exception& ) { - std::ostringstream slottitle; - slottitle << _("Slot") << " " << slot << " - " << _("Free"); - return slottitle.str(); - } - - std::ostringstream slottitle; - slottitle << _("Slot") << " " << slot << " - " << title; - return slottitle.str(); -} - -bool -TitleScreen::process_load_game_menu() -{ - int slot = load_game_menu->check(); - - if(slot == -1) - return false; - - if(load_game_menu->get_item_by_id(slot).kind != MN_ACTION) - return false; - - std::string basename = current_world->get_basedir(); - basename = basename.substr(0, basename.length()-1); - std::string worlddirname = FileSystem::basename(basename); - std::stringstream stream; - stream << "save/" << worlddirname << "_" << slot << ".stsg"; + stream << "profile" << config->profile << "/" << worlddirname << ".stsg"; std::string slotfile = stream.str(); try { @@ -551,6 +517,4 @@ TitleScreen::process_load_game_menu() } catch(std::exception& e) { log_fatal << "Couldn't start world: " << e.what() << std::endl; } - - return true; }