jaildesigner-jailgames/volcano_2022
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Añadida la animación de morir

Browse Source
This commit is contained in:
Sergio
2022-09-24 00:03:05 +02:00
parent e18db352e0
commit 330185720d
7 changed files with 133 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
source/game.cpp
View File

@@ -3,20 +3,24 @@
// Constructor
Game::Game(SDL_Renderer *renderer, Screen *screen, Asset *asset, Input *input, Debug *debug)
{
// Inicializa algunas variables
spawnPoint = {63, 190, 0, 0, s_standing, SDL_FLIP_NONE};
currentMap = "01.map";
// Copia punteros
this->renderer = renderer;
this->asset = asset;
this->screen = screen;
this->input = input;
this->debug = debug;
this->debug->setEnabled(true);
// this->debug->setEnabled(true);
// Reserva memoria para los objetos
scoreboard = new ScoreBoard(renderer, asset, input, &board);
eventHandler = new SDL_Event();
itemTracker = new ItemTracker();
map = new Map(asset->get("01.map"), renderer, asset, itemTracker);
player = new Player(renderer, asset, input, map, debug, &board.diamonds);
map = new Map(asset->get(currentMap), renderer, asset, itemTracker);
player = new Player(spawnPoint, renderer, asset, input, map, debug, &board.diamonds);
enemyEngine = new EnemyEngine(renderer, asset, player, map, asset->get(map->getEnemyFile()));
music = JA_LoadMusic(asset->get("music_surface.ogg").c_str());
@@ -192,9 +196,11 @@ void Game::checkEventHandler()
case SDL_SCANCODE_R:
delete map;
map = new Map(asset->get("01.map"), renderer, asset, itemTracker);
map = new Map(asset->get(currentMap), renderer, asset, itemTracker);
delete player;
player = new Player(renderer, asset, input, map, debug, &board.diamonds);
player = new Player(spawnPoint, renderer, asset, input, map, debug, &board.diamonds);
delete enemyEngine;
enemyEngine = new EnemyEngine(renderer, asset, player, map, asset->get(map->getEnemyFile()));
break;
@@ -270,7 +276,6 @@ void Game::renderDebugInfo()
// Cambia el mapa
bool Game::changeMap(std::string file)
{
bool success = false;
// En las habitaciones los limites tienen la cadena del fichero o un 0 en caso de no limitar con nada
if (file != "0")
{ // Verifica que exista el fichero que se va a cargar
@@ -284,11 +289,14 @@ bool Game::changeMap(std::string file)
delete enemyEngine;
enemyEngine = new EnemyEngine(renderer, asset, player, map, asset->get(map->getEnemyFile()));
success = true;
// Actualiza el valor de la variable
currentMap = file;
return true;
}
}
return success;
return false;
}
// Comprueba si el jugador está en el borde y se ha de cambiar el mapa
@@ -296,10 +304,12 @@ void Game::checkScreenBorders()
{
if (player->isOnScreenBorder())
{
if (changeMap(map->getRoomFileName(player->getBorder())))
const std::string room_name = map->getRoomFileName(player->getBorder());
if (changeMap(room_name))
{
player->setMap(map);
player->switchBorders();
spawnPoint = player->getSpawnParams();
}
}
}
@@ -315,10 +325,14 @@ void Game::reLoadTextures()
// Comprueba las colisiones del jugador con los enemigos
bool Game::checkPlayerEnemyCollisions()
{
if (player->getLivingState() != l_alive)
{
return false;
}
if (enemyEngine->checkEnemyCollision(player->getCollider()))
{
debug->add("COLLISION");
player->setLivingState(l_dead);
player->setLivingState(l_dying);
return true;
}
return false;
@@ -344,9 +358,9 @@ void Game::killPlayer()
board.lives--;
// Destruye el mapa, el jugador y los enemigos
//delete map;
// delete map;
delete player;
//delete enemyEngine;
// delete enemyEngine;
// Sonido
// JA_PlaySound(deathSound);
@@ -354,7 +368,7 @@ void Game::killPlayer()
// setBlackScreen();
// Crea el nuevo mapa, el nuevo jugador y nuevos enemigos
//map = new Map(asset->get("01.map"), renderer, asset, itemTracker);
player = new Player(renderer, asset, input, map, debug, &board.diamonds);
//enemyEngine = new EnemyEngine(renderer, asset, player, map, asset->get(map->getEnemyFile()));
// map = new Map(asset->get("01.map"), renderer, asset, itemTracker);
player = new Player(spawnPoint, renderer, asset, input, map, debug, &board.diamonds);
// enemyEngine = new EnemyEngine(renderer, asset, player, map, asset->get(map->getEnemyFile()));
}