tot pausa en les transicions
This commit is contained in:
@@ -893,10 +893,12 @@ void Game::checkPlayerIsOnBorder() {
|
|||||||
player_->switchBorders();
|
player_->switchBorders();
|
||||||
spawn_data_ = player_->getSpawnParams();
|
spawn_data_ = player_->getSpawnParams();
|
||||||
|
|
||||||
// Iniciar transición animada
|
// Iniciar transición animada (pausar jugador y entidades)
|
||||||
transitioning_ = true;
|
transitioning_ = true;
|
||||||
transition_timer_ = 0.0F;
|
transition_timer_ = 0.0F;
|
||||||
player_->setPaused(true);
|
player_->setPaused(true);
|
||||||
|
room_->setPaused(true);
|
||||||
|
transition_old_room_->setPaused(true);
|
||||||
} else {
|
} else {
|
||||||
// changeRoom falló, limpiar
|
// changeRoom falló, limpiar
|
||||||
transition_old_room_.reset();
|
transition_old_room_.reset();
|
||||||
@@ -916,6 +918,8 @@ void Game::checkPlayerIsOnBorder() {
|
|||||||
// Finaliza la transición entre pantallas
|
// Finaliza la transición entre pantallas
|
||||||
void Game::endTransition() {
|
void Game::endTransition() {
|
||||||
player_->setPaused(false);
|
player_->setPaused(false);
|
||||||
|
room_->setPaused(false);
|
||||||
|
if (transition_old_room_) { transition_old_room_->setPaused(false); }
|
||||||
transitioning_ = false;
|
transitioning_ = false;
|
||||||
transition_just_ended_ = true;
|
transition_just_ended_ = true;
|
||||||
transition_timer_ = 0.0F;
|
transition_timer_ = 0.0F;
|
||||||
|
|||||||
Reference in New Issue
Block a user