X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftitle.cpp;h=b43e09c9a50bef5179a91b20f4f26cd39c8d0946;hb=0262a9c0ae29d375e8174038d8cc81ebbeb10215;hp=93caf43949b124e2f5d5f849df2a18b0a93cd0ce;hpb=37afc25157dc5c2da47d5cf762318f2eda7f2aec;p=supertux.git diff --git a/src/title.cpp b/src/title.cpp index 93caf4394..b43e09c9a 100644 --- a/src/title.cpp +++ b/src/title.cpp @@ -26,13 +26,15 @@ #include #include #include +#include #include #include -#include #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 @@ -146,7 +139,7 @@ TitleScreen::get_level_name(const std::string& filename) { try { lisp::Parser parser; - std::auto_ptr root (parser.parse(filename)); + const lisp::Lisp* root = parser.parse(filename); const lisp::Lisp* level = root->get_lisp("supertux-level"); if(!level) @@ -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()); @@ -214,18 +206,31 @@ namespace { { return a1.title < a2.title; } + + const int ADDON_LIST_START_ID = 10; } void TitleScreen::generate_addons_menu() { AddonManager& adm = AddonManager::get_instance(); - addons = adm.get_addons(); - // sort addons + // refresh list of installed addons + installed_addons = adm.get_installed_addons(); + + // build new Add-on list + addons.clear(); + + // add installed addons to list + addons.insert(addons.end(), installed_addons.begin(), installed_addons.end()); + + // add available addons to list + addons.insert(addons.end(), available_addons.begin(), available_addons.end()); + + // sort list std::sort(addons.begin(), addons.end(), generate_addons_menu_sorter); - // hide installed addons from installation menu + // remove available addons that are already installed std::vector::iterator it2 = addons.begin(); while (it2 != addons.end()) { Addon addon = *it2; @@ -233,7 +238,7 @@ TitleScreen::generate_addons_menu() bool restart = false; for (std::vector::iterator it = addons.begin(); it != addons.end(); ++it) { Addon addon2 = *it; - if ((addon2.title == addon.title) && (!addon2.isInstalled)) { + if ((addon2.equals(addon)) && (!addon2.isInstalled)) { addons.erase(it); restart = true; break; @@ -247,20 +252,28 @@ TitleScreen::generate_addons_menu() it2++; } + // (re)generate menu free_addons_menu(); addons_menu.reset(new Menu()); addons_menu->add_label(_("Add-ons")); addons_menu->add_hl(); + +#ifdef HAVE_LIBCURL + addons_menu->add_entry(0, std::string(_("Check Online"))); +#else + addons_menu->add_deactive(0, std::string(_("Check Online (disabled)"))); +#endif - int i = 0; - for (std::vector::iterator it = addons.begin(); it != addons.end(); ++it) { - Addon addon = *it; - if (addon.isInstalled) { - addons_menu->add_entry(i++, std::string(_("Remove")) + " \"" + addon.title + "\""); - } else { - addons_menu->add_entry(i++, std::string(_("Install")) + " \"" + addon.title + "\""); - } + //addons_menu->add_hl(); + + for (unsigned int i = 0; i < addons.size(); i++) { + Addon addon = addons[i]; + std::string text = ""; + if (addon.kind != "") text += addon.kind + " "; + text += std::string("\"") + addon.title + "\""; + if (addon.author != "") text += " by \"" + addon.author + "\""; + addons_menu->add_toggle(ADDON_LIST_START_ID + i, text, addon.isInstalled); } addons_menu->add_hl(); @@ -273,17 +286,48 @@ TitleScreen::check_addons_menu() int index = addons_menu->check(); if (index == -1) return; - //AddonManager& adm = AddonManager::get_instance(); - Addon addon = addons[index]; - if (!addon.isInstalled) { - addon.install(); - generate_addons_menu(); - Menu::set_current(addons_menu.get()); - } else { - addon.remove(); - generate_addons_menu(); - Menu::set_current(addons_menu.get()); + // check if "Check Online" was chosen + if (index == 0) { + 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; } + + // if one of the Addons listed was chosen, take appropriate action + if ((index >= ADDON_LIST_START_ID) && (index < ADDON_LIST_START_ID) + addons.size()) { + Addon addon = addons[index - ADDON_LIST_START_ID]; + if (!addon.isInstalled) { + 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 { + 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; + } + } + } + } void @@ -328,6 +372,12 @@ TitleScreen::TitleScreen() player->set_controller(controller.get()); player->set_speedlimit(230); //MAX_WALK_XM + generate_main_menu(); +} + +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")); @@ -374,7 +424,7 @@ TitleScreen::draw(DrawingContext& context) Vector(5, SCREEN_HEIGHT - 50), ALIGN_LEFT, LAYER_FOREGROUND1); context.draw_text(white_small_text, _( -"Copyright (c) 2006 SuperTux Devel Team\n" +"Copyright (c) 2007 SuperTux Devel Team\n" "This game comes with ABSOLUTELY NO WARRANTY. This is free software, and you are welcome to\n" "redistribute it under certain conditions; see the file COPYING for details.\n" ), @@ -404,45 +454,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()) { @@ -455,59 +491,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; - std::auto_ptr 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 { @@ -516,6 +512,4 @@ TitleScreen::process_load_game_menu() } catch(std::exception& e) { log_fatal << "Couldn't start world: " << e.what() << std::endl; } - - return true; }