X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Ftitle.cpp;h=a187aeaad9705fdad5d510f6030b5ecebbc907b5;hb=1142f65fdd5ccc3309a3da31fb1a0e7d5d0829fe;hp=a990c69b24b0fb473f2551cca1d0be245f9b8cd1;hpb=b0278ee8b412817233ae20b9edb6f7a641774c67;p=supertux.git diff --git a/src/title.cpp b/src/title.cpp index a990c69b2..a187aeaad 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" @@ -64,7 +66,7 @@ #include "options_menu.hpp" #include "console.hpp" #include "random_generator.hpp" -#include "addon_manager.hpp" +#include "addon/addon_manager.hpp" enum MainMenuIDs { MNID_STARTGAME, @@ -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 @@ -156,7 +149,7 @@ TitleScreen::get_level_name(const std::string& filename) level->get("name", name); return name; } catch(std::exception& e) { - log_warning << "Problem getting name of '" << filename << "': " + log_warning << "Problem getting name of '" << filename << "': " << e.what() << std::endl; return ""; } @@ -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()); @@ -210,9 +202,9 @@ TitleScreen::check_contrib_world_menu() } namespace { - bool generate_addons_menu_sorter(const Addon& a1, const Addon& a2) + bool generate_addons_menu_sorter(const Addon* a1, const Addon* a2) { - return a1.title < a2.title; + return a1->title < a2->title; } const int ADDON_LIST_START_ID = 10; @@ -223,43 +215,12 @@ TitleScreen::generate_addons_menu() { AddonManager& adm = AddonManager::get_instance(); - // refresh list of installed addons - installed_addons = adm.get_installed_addons(); + // refresh list of addons + addons = adm.get_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); - // remove available addons that are already installed - std::vector::iterator it2 = addons.begin(); - while (it2 != addons.end()) { - Addon addon = *it2; - if (addon.isInstalled) { - bool restart = false; - for (std::vector::iterator it = addons.begin(); it != addons.end(); ++it) { - Addon addon2 = *it; - if ((addon2.equals(addon)) && (!addon2.isInstalled)) { - addons.erase(it); - restart = true; - break; - } - } - if (restart) { - it2 = addons.begin(); - continue; - } - } - it2++; - } - // (re)generate menu free_addons_menu(); addons_menu.reset(new Menu()); @@ -270,18 +231,18 @@ TitleScreen::generate_addons_menu() #ifdef HAVE_LIBCURL addons_menu->add_entry(0, std::string(_("Check Online"))); #else - addons_menu->add_deactive(0, std::string(_("Check Online (disabled)"))); + addons_menu->add_inactive(0, std::string(_("Check Online (disabled)"))); #endif //addons_menu->add_hl(); for (unsigned int i = 0; i < addons.size(); i++) { - Addon addon = addons[i]; + const 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_toggle(ADDON_LIST_START_ID + i, text, addon.loaded); } addons_menu->add_hl(); @@ -297,43 +258,46 @@ TitleScreen::check_addons_menu() // check if "Check Online" was chosen if (index == 0) { try { - available_addons = AddonManager::get_instance().get_available_addons(); + AddonManager::get_instance().check_online(); 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 with error message \"" << e.what() << "\"" << std::endl; + 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) { + Addon& addon = *addons[index - ADDON_LIST_START_ID]; + if (!addon.installed) { try { - addon.install(); - generate_addons_menu(); - Menu::set_current(addons_menu.get()); - addons_menu->set_active_item(index); + AddonManager::get_instance().install(&addon); } catch (std::runtime_error e) { - log_warning << "Installation of Add-on failed with error message \"" << e.what() << "\"" << std::endl; + log_warning << "Installing Add-on failed: " << e.what() << std::endl; } + addons_menu->set_toggled(index, addon.loaded); + } else if (!addon.loaded) { + try { + AddonManager::get_instance().enable(&addon); + } + catch (std::runtime_error e) { + log_warning << "Enabling Add-on failed: " << e.what() << std::endl; + } + addons_menu->set_toggled(index, addon.loaded); } else { try { - addon.remove(); - generate_addons_menu(); - Menu::set_current(addons_menu.get()); - addons_menu->set_active_item(index); + AddonManager::get_instance().disable(&addon); } catch (std::runtime_error e) { - log_warning << "Removal of Add-on failed with error message \"" << e.what() << "\"" << std::endl; + log_warning << "Disabling Add-on failed: " << e.what() << std::endl; } + addons_menu->set_toggled(index, addon.loaded); } } - } void @@ -362,7 +326,7 @@ TitleScreen::make_tux_jump() jumpWasReleased = true; } - // Wrap around at the end of the level back to the beginnig + // Wrap around at the end of the level back to the beginning if(sector->get_width() - 320 < tux->get_pos().x) { sector->activate("main"); sector->camera->reset(tux->get_pos()); @@ -378,6 +342,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")); @@ -420,15 +392,18 @@ TitleScreen::draw(DrawingContext& context) Sector* sector = titlesession->get_current_sector(); sector->draw(context); - context.draw_text(white_small_text, "SuperTux " PACKAGE_VERSION "\n", + // 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(small_font, "SuperTux " PACKAGE_VERSION "\n", Vector(5, SCREEN_HEIGHT - 50), ALIGN_LEFT, LAYER_FOREGROUND1); - context.draw_text(white_small_text, + context.draw_text(small_font, _( "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" ), - Vector(5, SCREEN_HEIGHT - 50 + white_small_text->get_height() + 5), + Vector(5, SCREEN_HEIGHT - 50 + small_font->get_height() + 5), ALIGN_LEFT, LAYER_FOREGROUND1); } @@ -454,45 +429,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()) { @@ -505,59 +466,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 { @@ -566,6 +487,4 @@ TitleScreen::process_load_game_menu() } catch(std::exception& e) { log_fatal << "Couldn't start world: " << e.what() << std::endl; } - - return true; }