X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fgame_session.cpp;h=26f65f1c43cf9a4dbd3ede596cbf584dd6f5d9df;hb=f6504762d01217fbbba3923b8e7f3b84d30c088c;hp=ee036eb18efc29a8e7d8efefd202c260c068b157;hpb=3364223e2ff9e7c4ea784ea065d5c53e223e51c8;p=supertux.git diff --git a/src/game_session.cpp b/src/game_session.cpp index ee036eb18..26f65f1c4 100644 --- a/src/game_session.cpp +++ b/src/game_session.cpp @@ -135,7 +135,6 @@ GameSession::restart_level() level->stats.total_badguys = level->get_total_badguys(); level->stats.total_secrets = level->get_total_count(); level->stats.reset(); - if(reset_sector != "")level->stats.declare_invalid(); if(reset_sector != "") { currentsector = level->get_sector(reset_sector); @@ -144,11 +143,13 @@ GameSession::restart_level() msg << "Couldn't find sector '" << reset_sector << "' for resetting tux."; throw std::runtime_error(msg.str()); } + level->stats.declare_invalid(); currentsector->activate(reset_pos); } else { currentsector = level->get_sector("main"); if(!currentsector) throw std::runtime_error("Couldn't find main sector"); + play_time = 0; currentsector->activate("main"); } @@ -443,7 +444,7 @@ GameSession::draw_pause(DrawingContext& context) { context.draw_filled_rect( Vector(0,0), Vector(SCREEN_WIDTH, SCREEN_HEIGHT), - Color(.2f, .2f, .2f, .5f), LAYER_FOREGROUND1); + Color(0.0f, 0.0f, 0.0f, .25f), LAYER_FOREGROUND1); } void @@ -527,7 +528,7 @@ GameSession::update(float elapsed_time) } // update sounds - sound_manager->set_listener_position(currentsector->player->get_pos()); + if (currentsector && currentsector->camera) sound_manager->set_listener_position(currentsector->camera->get_center()); /* Handle music: */ if (end_sequence)