JailDoctor/jdd_opendingux
1
0
Fork 0
forked from jaildesigner-jailgames/jaildoctors_dilemma
Code Issues Pull Requests Projects Releases Wiki Activity

Cambiado el constructor de la clase Player

Browse Source
This commit is contained in:
Sergio
2022-10-31 07:38:48 +01:00
parent cb6050183b
commit aa3c7a4b80
4 changed files with 46 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/game.cpp
View File

@@ -31,7 +31,8 @@ Game::Game(SDL_Renderer *renderer, Screen *screen, Resource *resource, Asset *as
itemTracker = new ItemTracker();
roomTracker = new RoomTracker();
room = new Room(resource->getRoom(currentRoom), renderer, screen, asset, options, itemTracker, &board.items, debug);
player = new Player(spawnPoint, "player.png", "player.ani", renderer, resource, asset, options, input, room, debug);
const player_t player = {spawnPoint, "player.png", "player.ani", renderer, resource, asset, options, input, room, debug};
this->player = new Player(player);
eventHandler = new SDL_Event();
text = new Text(resource->getOffset("smb2.txt"), resource->getTexture("smb2.png"), renderer);
music = JA_LoadMusic(asset->get("game.ogg").c_str());
@@ -51,7 +52,7 @@ Game::Game(SDL_Renderer *renderer, Screen *screen, Resource *resource, Asset *as
blackScreen = false;
blackScreenCounter = 0;
player->setInvincible(debug->getEnabled());
this->player->setInvincible(debug->getEnabled());
board.music = !debug->getEnabled();
section.name = SECTION_PROG_GAME;
@@ -373,7 +374,7 @@ void Game::checkEndGame()
// Mata al jugador
void Game::killPlayer()
{
if (player->getInvincible())
if (this->player->getInvincible())
{
return;
}
@@ -382,7 +383,7 @@ void Game::killPlayer()
// Destruye la habitacion y el jugador
delete room;
delete player;
delete this->player;
// Sonido
JA_PlaySound(deathSound);
@@ -391,10 +392,11 @@ void Game::killPlayer()
// Crea la nueva habitación y el nuevo jugador
room = new Room(resource->getRoom(currentRoom), renderer, screen, asset, options, itemTracker, &board.items, debug);
player = new Player(spawnPoint, "player.png", "player.ani", renderer, resource, asset, options, input, room, debug);
const player_t player = {spawnPoint, "player.png", "player.ani", renderer, resource, asset, options, input, room, debug};
this->player = new Player(player);
room->pause();
player->pause();
this->player->pause();
}
// Recarga todas las texturas