X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fgame_session.cpp;h=b9b7510b7f1b94c3f952226247979b1adc0aaa3f;hb=dd793c93ac07637402de084f20c0e17d57fb069e;hp=c1ae83c1809a8179ae3bdeee46329c6f7fc88b8a;hpb=c307442e4bf1352cf1807b171b5ab175ba063b31;p=supertux.git diff --git a/src/game_session.cpp b/src/game_session.cpp index c1ae83c18..b9b7510b7 100644 --- a/src/game_session.cpp +++ b/src/game_session.cpp @@ -20,20 +20,21 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include -#include +#include #include #include #include "game_session.hpp" #include "log.hpp" +#include "console.hpp" #include "worldmap/worldmap.hpp" #include "mainloop.hpp" #include "audio/sound_manager.hpp" @@ -55,7 +56,6 @@ #include "statistics.hpp" #include "timer.hpp" #include "options_menu.hpp" -#include "object/fireworks.hpp" #include "textscroller.hpp" #include "control/codecontroller.hpp" #include "control/joystickkeyboardcontroller.hpp" @@ -66,8 +66,14 @@ #include "console.hpp" #include "flip_level_transformer.hpp" #include "trigger/secretarea_trigger.hpp" +#include "trigger/sequence_trigger.hpp" #include "random_generator.hpp" #include "scripting/squirrel_util.hpp" +#include "object/endsequence_walkright.hpp" +#include "object/endsequence_walkleft.hpp" +#include "object/endsequence_fireworks.hpp" +#include "direction.hpp" +#include "scripting/time_scheduler.hpp" // the engine will be run with a logical framerate of 64fps. // We chose 64fps here because it is a power of 2, so 1/64 gives an "even" @@ -92,10 +98,11 @@ GameSession::GameSession(const std::string& levelfile_, Statistics* statistics) currentsector = NULL; game_pause = false; + Scripting::TimeScheduler::instance->set_pause(game_pause); statistics_backdrop.reset(new Surface("images/engine/menu/score-backdrop.png")); - restart_level(true); + restart_level(); game_menu.reset(new Menu()); game_menu->add_label(_("Pause")); @@ -107,9 +114,10 @@ GameSession::GameSession(const std::string& levelfile_, Statistics* statistics) } void -GameSession::restart_level(bool fromBeginning) +GameSession::restart_level() { game_pause = false; + Scripting::TimeScheduler::instance->set_pause(game_pause); end_sequence = 0; main_controller->reset(); @@ -122,9 +130,8 @@ GameSession::restart_level(bool fromBeginning) level->stats.total_badguys = level->get_total_badguys(); level->stats.total_secrets = level->get_total_count(); level->stats.reset(); - if (!fromBeginning && (reset_sector != "")) level->stats.declare_invalid(); + if(reset_sector != "")level->stats.declare_invalid(); - if (fromBeginning) reset_sector=""; if(reset_sector != "") { currentsector = level->get_sector(reset_sector); if(!currentsector) { @@ -142,6 +149,7 @@ GameSession::restart_level(bool fromBeginning) //levelintro(); + sound_manager->stop_music(); currentsector->play_music(LEVEL_MUSIC); if(capture_file != "") { @@ -160,6 +168,11 @@ GameSession::~GameSession() delete playback_demo_stream; delete demo_controller; + if (game_pause) { + game_pause = false; + Scripting::TimeScheduler::instance->set_pause(game_pause); + } + current_ = NULL; } @@ -246,19 +259,19 @@ GameSession::levelintro() } // context.draw_text(gold_text, level->get_name(), Vector(SCREEN_WIDTH/2, 160), -// CENTER_ALLIGN, LAYER_FOREGROUND1); +// ALIGN_CENTER, LAYER_FOREGROUND1); context.draw_center_text(gold_text, level->get_name(), Vector(0, 160), LAYER_FOREGROUND1); std::stringstream ss_coins; ss_coins << _("Coins") << ": " << player_status->coins; context.draw_text(white_text, ss_coins.str(), Vector(SCREEN_WIDTH/2, 210), - CENTER_ALLIGN, LAYER_FOREGROUND1); + ALIGN_CENTER, LAYER_FOREGROUND1); if((level->get_author().size()) && (level->get_author() != "SuperTux Team")) context.draw_text(white_small_text, std::string(_("contributed by ")) + level->get_author(), - Vector(SCREEN_WIDTH/2, 350), CENTER_ALLIGN, LAYER_FOREGROUND1); + Vector(SCREEN_WIDTH/2, 350), ALIGN_CENTER, LAYER_FOREGROUND1); if(best_level_statistics != NULL) best_level_statistics->draw_message_info(context, _("Best Level Statistics")); @@ -292,9 +305,11 @@ GameSession::toggle_pause() Menu::set_current(game_menu.get()); game_menu->set_active_item(MNID_CONTINUE); game_pause = true; + Scripting::TimeScheduler::instance->set_pause(game_pause); } else { Menu::set_current(NULL); game_pause = false; + Scripting::TimeScheduler::instance->set_pause(game_pause); } } @@ -334,6 +349,7 @@ GameSession::process_events() // end of pause mode? if(!Menu::current() && game_pause) { game_pause = false; + Scripting::TimeScheduler::instance->set_pause(game_pause); } // playback a demo? @@ -378,18 +394,8 @@ GameSession::check_end_conditions() /* End of level? */ if(end_sequence && end_sequence->is_done()) { finish(true); - return; } else if (!end_sequence && tux->is_dead()) { - if (player_status->coins < 0) { - // No more coins: restart level from beginning - player_status->coins = 0; - restart_level(true); - } else { - // Still has coins: restart level from last reset point - restart_level(false); - } - - return; + restart_level(); } } @@ -438,6 +444,11 @@ GameSession::setup() Menu::set_current(NULL); current_ = this; + if(currentsector != Sector::current()) { + currentsector->activate(currentsector->player->get_pos()); + } + currentsector->play_music(LEVEL_MUSIC); + // Eat unneeded events SDL_Event event; while(SDL_PollEvent(&event)) @@ -577,39 +588,65 @@ GameSession::display_info_box(const std::string& text) void GameSession::start_sequence(const std::string& sequencename) { - if(sequencename == "endsequence" || sequencename == "fireworks") { - if(end_sequence) - return; - - end_sequence = new EndSequence(); - currentsector->add_object(end_sequence); - end_sequence->start(); - - sound_manager->play_music("music/leveldone.ogg", false); - currentsector->player->invincible_timer.start(7.3f); - - // Stop all clocks. - for(std::vector::iterator i = currentsector->gameobjects.begin(); - i != currentsector->gameobjects.end(); ++i) - { - GameObject* obj = *i; - - LevelTime* lt = dynamic_cast (obj); - if(lt) - lt->stop(); - } - - if(sequencename == "fireworks") { - currentsector->add_object(new Fireworks()); - } - } else if(sequencename == "stoptux") { - if(!end_sequence) { + // handle special "stoptux" sequence + if (sequencename == "stoptux") { + if (!end_sequence) { log_warning << "Final target reached without an active end sequence" << std::endl; this->start_sequence("endsequence"); } if (end_sequence) end_sequence->stop_tux(); - } else { - log_warning << "Unknown sequence '" << sequencename << "'" << std::endl; + return; + } + + // abort if a sequence is already playing + if (end_sequence) return; + + if (sequencename == "endsequence") { + + // Determine walking direction for Tux + /*float xst = 1.f, xend = 2.f; + for(std::vector::iterator i = currentsector->gameobjects.begin(); i != currentsector->gameobjects.end(); i++) { + SequenceTrigger* st = dynamic_cast(*i); + if(!st) + continue; + if(st->get_sequence_name() == "stoptux") + xend = st->get_pos().x; + else if(st->get_sequence_name() == "endsequence") + xst = st->get_pos().y; + } + + if (xst > xend) { + end_sequence = new EndSequenceWalkLeft(); + } else { + end_sequence = new EndSequenceWalkRight(); + }*/ + if (currentsector->get_players()[0]->physic.get_velocity_x() < 0) { + end_sequence = new EndSequenceWalkLeft(); + } else { + end_sequence = new EndSequenceWalkRight(); + } + } + else if (sequencename == "fireworks") end_sequence = new EndSequenceFireworks(); + else { + log_warning << "Unknown sequence '" << sequencename << "'. Ignoring." << std::endl; + return; + } + + currentsector->add_object(end_sequence); + end_sequence->start(); + + sound_manager->play_music("music/leveldone.ogg", false); + currentsector->player->invincible_timer.start(10000.0f); + + // Stop all clocks. + for(std::vector::iterator i = currentsector->gameobjects.begin(); + i != currentsector->gameobjects.end(); ++i) + { + GameObject* obj = *i; + + LevelTime* lt = dynamic_cast (obj); + if(lt) + lt->stop(); } }