Actualizada la clase screen con nuevos procedimientos

This commit is contained in:
2022-08-30 17:31:33 +02:00
parent cbdc7d9fc3
commit 8616c3e165
6 changed files with 81 additions and 31 deletions

View File

@@ -87,16 +87,46 @@ void Game::update()
section.name = SECTION_PROG_QUIT;
break;
}
else if ((eventHandler->type == SDL_KEYDOWN) and (eventHandler->key.repeat == 0))
{
switch (eventHandler->key.keysym.scancode)
{
case SDL_SCANCODE_D:
debug = !debug;
break;
case SDL_SCANCODE_F:
screen->switchVideoMode();
break;
case SDL_SCANCODE_F1:
screen->setWindowSize(1);
break;
case SDL_SCANCODE_F2:
screen->setWindowSize(2);
break;
case SDL_SCANCODE_F3:
screen->setWindowSize(3);
break;
case SDL_SCANCODE_F4:
screen->setWindowSize(4);
break;
}
}
}
room->update();
player->update();
checkPlayerAndWalls(); // Debe ir detras del player update, por si se ha metido en algun muro
{
player->update();
checkPlayerAndWalls();
} // Debe ir detras del player update, por si se ha metido en algun muro
checkPlayerOnBorder();
checkPlayerOnFloor();
checkPlayerAndItems();
checkPlayerAndEnemies();
checkInput();
}
}
@@ -144,28 +174,6 @@ void Game::render()
screen->blit();
}
// Comprueba la entrada
void Game::checkInput()
{
/*
if (input->checkInput(INPUT_UP, REPEAT_FALSE))
changeRoom(room->getRoomUp());
if (input->checkInput(INPUT_DOWN, REPEAT_FALSE))
changeRoom(room->getRoomDown());
if (input->checkInput(INPUT_LEFT, REPEAT_FALSE))
changeRoom(room->getRoomLeft());
if (input->checkInput(INPUT_RIGHT, REPEAT_FALSE))
changeRoom(room->getRoomRight());
*/
if (input->checkInput(INPUT_BUTTON_2, REPEAT_FALSE))
debug = !debug;
}
// Cambia de habitación
bool Game::changeRoom(std::string file)
{