diff --git a/source/demo.cpp b/source/demo.cpp index 33c35af8..1dee590a 100644 --- a/source/demo.cpp +++ b/source/demo.cpp @@ -40,7 +40,7 @@ Demo::Demo(SDL_Renderer *renderer, Screen *screen, Resource *resource, Asset *as board.lives = 9; board.items = 0; board.rooms = 1; - board.jailEnabled = options->cheat.jailEnabled; + board.jailEnabled = false; board.music = true; setScoreBoardColor(); diff --git a/source/game.cpp b/source/game.cpp index a290d951..8d9ab160 100644 --- a/source/game.cpp +++ b/source/game.cpp @@ -539,22 +539,16 @@ void Game::setScoreBoardColor() // Comprueba si ha finalizado el juego bool Game::checkEndGame() { - const bool isOnTheRoom = room->getName() == "THE JAIL"; // Estar en la habitación que toca - const bool haveTheItems = board.items >= int(totalItems * 0.9f); // Con mas del 90% de los items recogidos - const bool isOnTheDoor = player->getRect().x <= 128; // Y en la ubicación que toca (En la puerta) + const bool isOnTheRoom = room->getName() == "THE JAIL"; // Estar en la habitación que toca + const bool haveTheItems = board.items >= int(totalItems * 0.9f) || options->cheat.jailEnabled; // Con mas del 90% de los items recogidos + const bool isOnTheDoor = player->getRect().x <= 128; // Y en la ubicación que toca (En la puerta) if (haveTheItems) { board.jailEnabled = true; } - if (isOnTheRoom && haveTheItems && isOnTheDoor) - { - section.name = SECTION_PROG_ENDING; - return true; - } - - if (options->cheat.jailEnabled && isOnTheRoom && isOnTheDoor) + if (haveTheItems && isOnTheRoom && isOnTheDoor) { section.name = SECTION_PROG_ENDING; return true; diff --git a/source/room.cpp b/source/room.cpp index cf128754..14b40d6d 100644 --- a/source/room.cpp +++ b/source/room.cpp @@ -1524,9 +1524,6 @@ void Room::openTheJail() { if (name == "THE JAIL") { - // Cambia el color de fondo - bgColor = "red"; - // Elimina el último enemigo (Bry debe ser el ultimo enemigo definido en el fichero) delete enemies.back(); enemies.pop_back();