diff --git a/source/credits.cpp b/source/credits.cpp index 1227d22..fe83e39 100644 --- a/source/credits.cpp +++ b/source/credits.cpp @@ -121,7 +121,7 @@ void Credits::render() SDL_RenderCopy(Screen::get()->getRenderer(), canvas_, nullptr, nullptr); // Vuelca el contenido del renderizador en pantalla - Screen::get()->blit(); + Screen::get()->render(); } // Comprueba el manejador de eventos diff --git a/source/game.cpp b/source/game.cpp index a82a4c9..e051ee7 100644 --- a/source/game.cpp +++ b/source/game.cpp @@ -917,7 +917,6 @@ void Game::update() if (SDL_GetTicks() - ticks_ > TICKS_SPEED) { ticks_ = SDL_GetTicks(); - counter_++; updateDemo(); #ifdef RECORDING @@ -927,15 +926,6 @@ void Game::update() { switch (state_) { - case GameState::COMPLETED: - updateGameStateCompleted(); - break; - case GameState::GAME_OVER: - updateGameStateGameOver(); - break; - case GameState::PLAYING: - updateGameStatePlaying(); - break; case GameState::FADE_IN: updateGameStateFadeIn(); break; @@ -945,7 +935,15 @@ void Game::update() case GameState::SHOWING_GET_READY_MESSAGE: updateGameStateShowingGetReadyMessage(); break; - + case GameState::PLAYING: + updateGameStatePlaying(); + break; + case GameState::COMPLETED: + updateGameStateCompleted(); + break; + case GameState::GAME_OVER: + updateGameStateGameOver(); + break; default: break; } @@ -1027,7 +1025,7 @@ void Game::render() fade_out_->render(); // Vuelca el contenido del renderizador en pantalla - screen_->blit(); + screen_->render(); } // Habilita el efecto del item de detener el tiempo diff --git a/source/hiscore_table.cpp b/source/hiscore_table.cpp index 36b393b..7cb70ff 100644 --- a/source/hiscore_table.cpp +++ b/source/hiscore_table.cpp @@ -164,7 +164,7 @@ void HiScoreTable::render() fade_->render(); // Vuelca el contenido del renderizador en pantalla - Screen::get()->blit(); + Screen::get()->render(); } // Recarga todas las texturas diff --git a/source/instructions.cpp b/source/instructions.cpp index d08e25e..886420d 100644 --- a/source/instructions.cpp +++ b/source/instructions.cpp @@ -265,7 +265,7 @@ void Instructions::render() fade_->render(); // Vuelca el contenido del renderizador en pantalla - Screen::get()->blit(); + Screen::get()->render(); } // Recarga todas las texturas diff --git a/source/intro.cpp b/source/intro.cpp index 2ca8b37..f5b6790 100644 --- a/source/intro.cpp +++ b/source/intro.cpp @@ -415,7 +415,7 @@ void Intro::render() } // Vuelca el contenido del renderizador en pantalla - Screen::get()->blit(); + Screen::get()->render(); } // Bucle principal diff --git a/source/logo.cpp b/source/logo.cpp index 5346dc4..6ee92b4 100644 --- a/source/logo.cpp +++ b/source/logo.cpp @@ -231,7 +231,7 @@ void Logo::render() } // Vuelca el contenido del renderizador en pantalla - Screen::get()->blit(); + Screen::get()->render(); } // Bucle para el logo del juego diff --git a/source/screen.cpp b/source/screen.cpp index f06515a..48cb842 100644 --- a/source/screen.cpp +++ b/source/screen.cpp @@ -83,7 +83,7 @@ void Screen::start() } // Vuelca el contenido del renderizador en pantalla -void Screen::blit() +void Screen::render() { // Actualiza el contador de FPS fps_counter_++; diff --git a/source/screen.h b/source/screen.h index 74a38f0..e2805b4 100644 --- a/source/screen.h +++ b/source/screen.h @@ -136,7 +136,7 @@ public: void start(); // Vuelca el contenido del renderizador en pantalla - void blit(); + void render(); // Establece el modo de video void setVideoMode(ScreenVideoMode video_mode); diff --git a/source/title.cpp b/source/title.cpp index cfdd779..ac05fa8 100644 --- a/source/title.cpp +++ b/source/title.cpp @@ -207,7 +207,7 @@ void Title::render() fade_->render(); // Vuelca el contenido del renderizador en pantalla - Screen::get()->blit(); + Screen::get()->render(); } // Comprueba los eventos