X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fgame_session.cpp;h=12c0bd1c0274730daf100adbef9b5ba7b6a884e9;hb=8f96892abd26903702f61978f74c2c5d012236ae;hp=b7985bbb6706c9fa5811f6bddb9606e194dc9bd2;hpb=b72c5d178e4cc95130735d8bf8716513c7cc28e1;p=supertux.git diff --git a/src/game_session.cpp b/src/game_session.cpp index b7985bbb6..12c0bd1c0 100644 --- a/src/game_session.cpp +++ b/src/game_session.cpp @@ -63,6 +63,8 @@ #include "file_system.hpp" #include "gameconfig.hpp" #include "gettext.hpp" +#include "exceptions.hpp" +#include "flip_level_transformer.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" @@ -147,6 +149,8 @@ GameSession::~GameSession() delete end_sequence_controller; delete level; delete context; + + current_ = NULL; } void @@ -268,7 +272,7 @@ GameSession::process_events() Menu::current()->event(event); main_controller->process_event(event); if(event.type == SDL_QUIT) - throw std::runtime_error("Received window close"); + throw graceful_shutdown(); } // playback a demo? @@ -336,6 +340,10 @@ GameSession::try_cheats() // be invincle for the rest of the level tux.invincible_timer.start(10000); } + if(main_controller->check_cheatcode("mortal")) { + // give up invincibility + tux.invincible_timer.stop(); + } if(main_controller->check_cheatcode("shrink")) { // remove powerups tux.kill(tux.SHRINK); @@ -345,16 +353,15 @@ GameSession::try_cheats() player_status->lives++; tux.kill(tux.KILL); } + if(main_controller->check_cheatcode("whereami")) { + std::cout << "You are at x " << tux.get_pos().x << ", y " << tux.get_pos().y << "." << std::endl; + } #if 0 if(main_controller->check_cheatcode("grid")) { // toggle debug grid debug_grid = !debug_grid; } #endif - if(main_controller->check_cheatcode("hover")) { - // toggle hover ability on/off - tux.enable_hover = !tux.enable_hover; - } if(main_controller->check_cheatcode("gotoend")) { // goes to the end of the level tux.move(Vector( @@ -362,21 +369,15 @@ GameSession::try_cheats() currentsector->camera->reset( Vector(tux.get_pos().x, tux.get_pos().y)); } + if(main_controller->check_cheatcode("flip")) { + FlipLevelTransformer flip_transformer; + flip_transformer.transform(GameSession::current()->get_current_level()); + } if(main_controller->check_cheatcode("finish")) { // finish current sector exit_status = ES_LEVEL_FINISHED; // don't add points to stats though... } - // temporary to help player's choosing a flapping - if(main_controller->check_cheatcode("marek")) { - tux.flapping_mode = Player::MAREK_FLAP; - } - if(main_controller->check_cheatcode("ricardo")) { - tux.flapping_mode = Player::RICARDO_FLAP; - } - if(main_controller->check_cheatcode("ryan")) { - tux.flapping_mode = Player::RYAN_FLAP; - } } void @@ -448,33 +449,9 @@ GameSession::draw() void GameSession::draw_pause() { - int x = SCREEN_HEIGHT / 20; - for(int i = 0; i < x; ++i) { - context->draw_filled_rect( - Vector(i % 2 ? (pause_menu_frame * i)%SCREEN_WIDTH : - -((pause_menu_frame * i)%SCREEN_WIDTH) - ,(i*20+pause_menu_frame)%SCREEN_HEIGHT), - Vector(SCREEN_WIDTH,10), - Color(20,20,20, rand() % 20 + 1), LAYER_FOREGROUND1+1); - } - context->draw_filled_rect( Vector(0,0), Vector(SCREEN_WIDTH, SCREEN_HEIGHT), - Color(rand() % 50, rand() % 50, rand() % 50, 128), LAYER_FOREGROUND1); -#if 0 - context->draw_text(blue_text, _("PAUSE - Press 'P' To Play"), - Vector(SCREEN_WIDTH/2, 230), CENTER_ALLIGN, LAYER_FOREGROUND1+2); - - const char* str1 = _("Playing: "); - const char* str2 = level->get_name().c_str(); - - context->draw_text(blue_text, str1, - Vector((SCREEN_WIDTH - (blue_text->get_text_width(str1) + white_text->get_text_width(str2)))/2, 340), - LEFT_ALLIGN, LAYER_FOREGROUND1+2); - context->draw_text(white_text, str2, - Vector(((SCREEN_WIDTH - (blue_text->get_text_width(str1) + white_text->get_text_width(str2)))/2)+blue_text->get_text_width(str1), 340), - LEFT_ALLIGN, LAYER_FOREGROUND1+2); -#endif + Color(.2, .2, .2, .5), LAYER_FOREGROUND1); } void @@ -602,7 +579,9 @@ GameSession::run() //frame_rate.update(); /* Handle music: */ - if (currentsector->player->invincible_timer.started() && !end_sequence) + if (currentsector->player->invincible_timer.started() && + currentsector->player->invincible_timer.get_timeleft() + > TUX_INVINCIBLE_TIME_WARNING && !end_sequence) { currentsector->play_music(HERRING_MUSIC); } @@ -674,7 +653,7 @@ GameSession::display_info_box(const std::string& text) while (SDL_PollEvent(&event)) { main_controller->process_event(event); if(event.type == SDL_QUIT) - throw std::runtime_error("Received window close event"); + throw graceful_shutdown(); } if(main_controller->pressed(Controller::JUMP) @@ -682,6 +661,10 @@ GameSession::display_info_box(const std::string& text) || main_controller->pressed(Controller::PAUSE_MENU) || main_controller->pressed(Controller::MENU_SELECT)) running = false; + else if(main_controller->pressed(Controller::DOWN)) + box->scrolldown(); + else if(main_controller->pressed(Controller::UP)) + box->scrollup(); box->draw(*context); draw(); sound_manager->update(); @@ -707,6 +690,11 @@ GameSession::start_sequence(const std::string& sequencename) currentsector->add_object(new Fireworks()); } } else if(sequencename == "stoptux") { + if(!end_sequence) { + std::cout << "WARNING: Final target reached without " + << "an active end sequence." << std::endl; + this->start_sequence("endsequence"); + } end_sequence = ENDSEQUENCE_WAITING; } else { std::cout << "Unknown sequence '" << sequencename << "'.\n"; @@ -721,7 +709,7 @@ GameSession::drawstatus(DrawingContext& context) if(config->show_fps) { char str[60]; - snprintf(str, sizeof(str), "%2.1f", fps_fps); + snprintf(str, sizeof(str), "%3.1f", fps_fps); context.draw_text(white_text, "FPS", Vector(SCREEN_WIDTH - white_text->get_text_width("FPS ") - BORDER_X, BORDER_Y + 40), @@ -749,11 +737,12 @@ GameSession::drawresultscreen() context.draw_text(blue_text, _("Result:"), Vector(SCREEN_WIDTH/2, 200), CENTER_ALLIGN, LAYER_FOREGROUND1); - sprintf(str, _("SCORE: %d"), global_stats.get_points(SCORE_STAT)); - context.draw_text(gold_text, str, Vector(SCREEN_WIDTH/2, 224), CENTER_ALLIGN, LAYER_FOREGROUND1); +// sprintf(str, _("SCORE: %d"), global_stats.get_points(SCORE_STAT)); +// context.draw_text(gold_text, str, Vector(SCREEN_WIDTH/2, 224), CENTER_ALLIGN, LAYER_FOREGROUND1); + // y == 256 before removal of score sprintf(str, _("COINS: %d"), player_status->coins); - context.draw_text(gold_text, str, Vector(SCREEN_WIDTH/2, 256), CENTER_ALLIGN, LAYER_FOREGROUND1); + context.draw_text(gold_text, str, Vector(SCREEN_WIDTH/2, 224), CENTER_ALLIGN, LAYER_FOREGROUND1); context.do_drawing();