X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftitle.cpp;h=2a34b101e56bc8a3d5cdc2d3b0c3a0c099ff3015;hb=dd9fdb809ad6effa216e4483f099a48ab2814352;hp=d2ed7daf0f08077daec2e1307733e396fcd607a0;hpb=f3e5e57c9996168a4889ae8e195be25f8b7e629b;p=supertux.git diff --git a/src/title.cpp b/src/title.cpp index d2ed7daf0..2a34b101e 100644 --- a/src/title.cpp +++ b/src/title.cpp @@ -1,8 +1,8 @@ // $Id$ -// +// // SuperTux -// Copyright (C) 2000 Bill Kendrick // Copyright (C) 2004 Tobias Glaesser +// Copyright (C) 2006 Matthias Braun // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -13,7 +13,7 @@ // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA @@ -26,16 +26,15 @@ #include #include #include +#include #include #include -#include #include #include #include #include "title.hpp" #include "mainloop.hpp" -#include "video/screen.hpp" #include "video/drawing_context.hpp" #include "video/surface.hpp" #include "audio/sound_manager.hpp" @@ -46,7 +45,7 @@ #include "level.hpp" #include "world.hpp" #include "game_session.hpp" -#include "worldmap.hpp" +#include "worldmap/worldmap.hpp" #include "player_status.hpp" #include "tile.hpp" #include "sector.hpp" @@ -55,14 +54,27 @@ #include "object/player.hpp" #include "resources.hpp" #include "gettext.hpp" -#include "misc.hpp" #include "textscroller.hpp" +#include "fadeout.hpp" #include "file_system.hpp" #include "control/joystickkeyboardcontroller.hpp" #include "control/codecontroller.hpp" #include "main.hpp" -#include "msg.hpp" +#include "log.hpp" +#include "options_menu.hpp" #include "console.hpp" +#include "random_generator.hpp" +#include "addon_manager.hpp" + +enum MainMenuIDs { + MNID_STARTGAME, + MNID_LEVELS_CONTRIB, + MNID_ADDONS, + MNID_OPTIONMENU, + MNID_LEVELEDITOR, + MNID_CREDITS, + MNID_QUITMAINMENU +}; void TitleScreen::update_load_game_menu() @@ -86,15 +98,13 @@ TitleScreen::free_contrib_menu() delete *i; contrib_worlds.clear(); - current_contrib_world = 0; - current_world = -1; } void TitleScreen::generate_contrib_menu() { /** Generating contrib levels list by making use of Level Subset */ - std::vector level_worlds; + std::vector level_worlds; char** files = PHYSFS_enumerateFiles("levels/"); for(const char* const* filename = files; *filename != 0; ++filename) { std::string filepath = std::string("levels/") + *filename; @@ -108,7 +118,7 @@ TitleScreen::generate_contrib_menu() contrib_menu->add_label(_("Contrib Levels")); contrib_menu->add_hl(); - + int i = 0; for (std::vector::iterator it = level_worlds.begin(); it != level_worlds.end(); ++it) { @@ -122,7 +132,7 @@ TitleScreen::generate_contrib_menu() contrib_worlds.push_back(world.release()); } catch(std::exception& e) { #ifdef DEBUG - msg_warning << "Couldn't parse levelset info for '" << *it << "': " << e.what() << std::endl; + log_warning << "Couldn't parse levelset info for '" << *it << "': " << e.what() << std::endl; #endif } } @@ -136,7 +146,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) @@ -146,7 +156,8 @@ TitleScreen::get_level_name(const std::string& filename) level->get("name", name); return name; } catch(std::exception& e) { - msg_warning << "Problem getting name of '" << filename << "'." << std::endl; + log_warning << "Problem getting name of '" << filename << "': " + << e.what() << std::endl; return ""; } } @@ -158,28 +169,21 @@ TitleScreen::check_levels_contrib_menu() if (index == -1) return; - World& world = * (contrib_worlds[index]); - - if(!world.is_levelset) { - // TODO fade out - world.run(); - } - - if (current_world != index) { - current_world = index; - World& world = * (contrib_worlds[index]); - - current_contrib_world = &world; + current_world = contrib_worlds[index]; + if(!current_world->is_levelset) { + update_load_game_menu(); + Menu::push_current(load_game_menu.get()); + } else { contrib_world_menu.reset(new Menu()); - contrib_world_menu->add_label(world.title); + contrib_world_menu->add_label(current_world->title); contrib_world_menu->add_hl(); - for (unsigned int i = 0; i < world.get_num_levels(); ++i) + for (unsigned int i = 0; i < current_world->get_num_levels(); ++i) { /** get level's title */ - std::string filename = world.get_level_filename(i); + std::string filename = current_world->get_level_filename(i); std::string title = get_level_name(filename); contrib_world_menu->add_entry(i, title); } @@ -199,62 +203,167 @@ TitleScreen::check_contrib_world_menu() if (contrib_world_menu->get_item_by_id(index).kind == MN_ACTION) { sound_manager->stop_music(); GameSession* session = - new GameSession( - current_contrib_world->get_level_filename(index), ST_GL_PLAY); + new GameSession(current_world->get_level_filename(index)); main_loop->push_screen(session); } - } + } +} + +namespace { + bool generate_addons_menu_sorter(const Addon& a1, const Addon& a2) + { + return a1.title < a2.title; + } + + const int ADDON_LIST_START_ID = 10; } void -TitleScreen::make_tux_jump() +TitleScreen::generate_addons_menu() +{ + AddonManager& adm = AddonManager::get_instance(); + + // 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); + + // 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()); + + 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 + + //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(); + addons_menu->add_back(_("Back")); +} + +void +TitleScreen::check_addons_menu() { - static Timer randomWaitTimer; - static Timer jumpPushTimer; - static float last_tux_x_pos = -1; - static float last_tux_y_pos = -1; + int index = addons_menu->check(); + if (index == -1) return; + + // 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); + } + 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); + } + catch (std::runtime_error e) { + log_warning << "Removal of Add-on failed: " << e.what() << std::endl; + } + } + } + +} + +void +TitleScreen::free_addons_menu() +{ +} + +void +TitleScreen::make_tux_jump() +{ + static bool jumpWasReleased = true; Sector* sector = titlesession->get_current_sector(); Player* tux = sector->player; - //sector->play_music(LEVEL_MUSIC); - controller->update(); controller->press(Controller::RIGHT); - // Determine how far we moved since last frame - float dx = fabsf(last_tux_x_pos - tux->get_pos().x); - float dy = fabsf(last_tux_y_pos - tux->get_pos().y); - - // Calculate space to check for obstacles - Rect lookahead = tux->get_bbox(); - lookahead.move(Vector(96, 0)); - // Check if we should press the jump button - bool randomJump = !randomWaitTimer.started(); - bool notMoving = (fabsf(dx) + fabsf(dy)) < 0.1; - bool pathBlocked = !sector->is_free_space(lookahead); - if (!controller->released(Controller::JUMP) - && (notMoving || pathBlocked || randomJump)) { - float jumpDuration; - if(pathBlocked) - jumpDuration = 0.5; - else - jumpDuration = float(rand() % 500 + 300) / 1000.0; - jumpPushTimer.start(jumpDuration); - randomWaitTimer.start(float(rand() % 3000 + 3000) / 1000.0); - } - - // Keep jump button pressed - if (jumpPushTimer.started()) + Rect lookahead = tux->get_bbox(); + lookahead.p2.x += 96; + bool pathBlocked = !sector->is_free_of_statics(lookahead); + if ((pathBlocked && jumpWasReleased) || !tux->on_ground()) { controller->press(Controller::JUMP); - - // Remember last position, so we can determine if we moved - last_tux_x_pos = tux->get_pos().x; - last_tux_y_pos = tux->get_pos().y; + jumpWasReleased = false; + } else { + jumpWasReleased = true; + } // Wrap around at the end of the level back to the beginnig - if(sector->solids->get_width() * 32 - 320 < tux->get_pos().x) { + if(sector->get_width() - 320 < tux->get_pos().x) { sector->activate("main"); sector->camera->reset(tux->get_pos()); } @@ -263,18 +372,20 @@ TitleScreen::make_tux_jump() TitleScreen::TitleScreen() { controller.reset(new CodeController()); - titlesession.reset(new GameSession("levels/misc/menu.stl", ST_GL_DEMO_GAME)); - - // delete contrib_world_menu; - // contrib_world_menu = new Menu(); - - titlesession->get_current_sector()->activate("main"); - titlesession->set_current(); + titlesession.reset(new GameSession("levels/misc/menu.stl")); Player* player = titlesession->get_current_sector()->player; player->set_controller(controller.get()); - - Menu::set_current(main_menu); + player->set_speedlimit(230); //MAX_WALK_XM + + main_menu.reset(new Menu()); + main_menu->set_pos(SCREEN_WIDTH/2, SCREEN_HEIGHT/2 + 35); + main_menu->add_entry(MNID_STARTGAME, _("Start Game")); + main_menu->add_entry(MNID_LEVELS_CONTRIB, _("Contrib Levels")); + main_menu->add_entry(MNID_ADDONS, _("Add-ons")); + main_menu->add_submenu(_("Options"), get_options_menu()); + main_menu->add_entry(MNID_CREDITS, _("Credits")); + main_menu->add_entry(MNID_QUITMAINMENU, _("Quit")); } TitleScreen::~TitleScreen() @@ -287,10 +398,12 @@ TitleScreen::setup() player_status->reset(); Sector* sector = titlesession->get_current_sector(); - sector->play_music(LEVEL_MUSIC); - sector->activate(sector->player->get_pos()); + if(Sector::current() != sector) { + sector->play_music(LEVEL_MUSIC); + sector->activate(sector->player->get_pos()); + } - Menu::set_current(main_menu); + Menu::set_current(main_menu.get()); } void @@ -298,6 +411,7 @@ TitleScreen::leave() { Sector* sector = titlesession->get_current_sector(); sector->deactivate(); + Menu::set_current(NULL); } void @@ -305,42 +419,41 @@ TitleScreen::draw(DrawingContext& context) { Sector* sector = titlesession->get_current_sector(); sector->draw(context); - - /* - if (Menu::current() == main_menu) - context.draw_surface(logo, Vector(SCREEN_WIDTH/2 - logo->get_width()/2, 30), - LAYER_FOREGROUND1+1); - */ - - context.draw_text(white_small_text, " SuperTux " PACKAGE_VERSION "\n", - Vector(0, SCREEN_HEIGHT - 50), LEFT_ALLIGN, 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, _( -"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" ), - Vector(0, SCREEN_HEIGHT - 50 + white_small_text->get_height() + 5), - LEFT_ALLIGN, LAYER_FOREGROUND1); + Vector(5, SCREEN_HEIGHT - 50 + white_small_text->get_height() + 5), + ALIGN_LEFT, LAYER_FOREGROUND1); } void TitleScreen::update(float elapsed_time) { - main_loop->set_speed(0.6); + main_loop->set_speed(0.6f); Sector* sector = titlesession->get_current_sector(); sector->update(elapsed_time); make_tux_jump(); - + Menu* menu = Menu::current(); if(menu) { menu->update(); - - if(menu == main_menu) { + + if(menu == main_menu.get()) { switch (main_menu->check()) { case MNID_STARTGAME: // Start Game, ie. goto the slots menu + if(main_world.get() == NULL) { + main_world.reset(new World()); + main_world->load("levels/world1/info"); + } + current_world = main_world.get(); update_load_game_menu(); Menu::push_current(load_game_menu.get()); break; @@ -349,16 +462,20 @@ TitleScreen::update(float elapsed_time) 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: - fadeout(500); - main_loop->push_screen(new TextScroller("credits.txt")); + main_loop->push_screen(new TextScroller("credits.txt"), + new FadeOut(0.5)); break; case MNID_QUITMAINMENU: - main_loop->quit(); + main_loop->quit(new FadeOut(0.25)); + sound_manager->stop_music(0.25); break; } - } else if(menu == options_menu) { - process_options_menu(); } else if(menu == load_game_menu.get()) { /* if(event.key.keysym.sym == SDLK_DELETE) { @@ -366,19 +483,21 @@ TitleScreen::update(float elapsed_time) 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"; - msg_debug << "Removing: " << str << std::endl; + log_debug << "Removing: " << str << std::endl; PHYSFS_delete(str.c_str()); } update_load_save_game_menu(load_game_menu); - Menu::set_current(main_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()) { + check_addons_menu(); } else if (menu == contrib_world_menu.get()) { check_contrib_world_menu(); } @@ -387,7 +506,7 @@ 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) { - Menu::set_current(main_menu); + Menu::set_current(main_menu.get()); } } @@ -395,27 +514,33 @@ std::string TitleScreen::get_slotinfo(int slot) { std::string tmp; - std::string slotfile; std::string title; - std::stringstream stream; - stream << slot; - slotfile = "save/slot" + stream.str() + ".stsg"; + + 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* 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& e) { - return std::string(_("Slot")) + " " + stream.str() + " - " + - std::string(_("Free")); + } catch(std::exception& ) { + std::ostringstream slottitle; + slottitle << _("Slot") << " " << slot << " - " << _("Free"); + return slottitle.str(); } - return std::string("Slot ") + stream.str() + " - " + title; + std::ostringstream slottitle; + slottitle << _("Slot") << " " << slot << " - " << title; + return slottitle.str(); } bool @@ -429,28 +554,19 @@ TitleScreen::process_load_game_menu() 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 << slot; - std::string slotfile = "save/slot" + stream.str() + ".stsg"; - - sound_manager->stop_music(); - fadeout(256); - DrawingContext context; - context.draw_text(white_text, "Loading...", - Vector(SCREEN_WIDTH/2, SCREEN_HEIGHT/2), - CENTER_ALLIGN, LAYER_FOREGROUND1); - context.do_drawing(); - - WorldMapNS::WorldMap* worldmap = new WorldMapNS::WorldMap(); - - worldmap->set_map_filename("/levels/world1/worldmap.stwm"); - // Load the game or at least set the savegame_file variable - worldmap->loadgame(slotfile); + stream << "save/" << worlddirname << "_" << slot << ".stsg"; + std::string slotfile = stream.str(); - main_loop->push_screen(worldmap); - - //Menu::set_current(main_menu); + try { + current_world->set_savegame_filename(slotfile); + current_world->run(); + } catch(std::exception& e) { + log_fatal << "Couldn't start world: " << e.what() << std::endl; + } return true; } -