Nuevo mapa de 60 habitaciones. Movido el contenido de media a data

This commit is contained in:
2022-09-18 12:25:46 +02:00
parent c2882da40b
commit d76958d9bb
229 changed files with 5114 additions and 970 deletions

View File

@@ -18,16 +18,16 @@ Game::Game(SDL_Renderer *renderer, Screen *screen, Asset *asset, Input *input, D
// ****
// this->debug->setEnabled(true);
currentRoom = "11.room";
spawnPoint = {2 * 8, 5 * 8, 0, 0, 0, s_standing, SDL_FLIP_HORIZONTAL};
//currentRoom = "11.room";
//spawnPoint = {2 * 8, 5 * 8, 0, 0, 0, s_standing, SDL_FLIP_HORIZONTAL};
// currentRoom = "06.room";
// spawnPoint = {14 * 8, 9 * 8, 0, 0, 0, s_standing, SDL_FLIP_HORIZONTAL};
//currentRoom = "06.room";
//spawnPoint = {14 * 8, 9 * 8, 0, 0, 0, s_standing, SDL_FLIP_HORIZONTAL};
currentRoom = "13.room";
const int x = 28;
currentRoom = "03.room";
const int x = 26;
const int y = 13;
spawnPoint = {x * 8, y * 8, 0, 0, 0, s_standing, SDL_FLIP_NONE};
spawnPoint = {x * 8, y * 8, 0, 0, 0, s_standing, SDL_FLIP_HORIZONTAL};
// ****
// Crea los objetos
@@ -424,7 +424,7 @@ void Game::reLoadTextures()
void Game::setBlackScreen()
{
blackScreen = true;
screen->setspectrumFade();
//screen->setspectrumFade();
}
// Actualiza las variables relativas a la pantalla en negro
@@ -432,16 +432,17 @@ void Game::updateBlackScreen()
{
if (blackScreen)
{
if (screen->spectrumFadeEnded())
//if (screen->spectrumFadeEnded())
{
blackScreenCounter++;
if (blackScreenCounter > 50)
if (blackScreenCounter > 10)
{
blackScreen = false;
blackScreenCounter = 0;
player->resume();
room->resume();
screen->setBorderColor(room->getBorderColor());
}
}
}